* [PATCH] kvm tools: Fix running with --initrd and no real discs/rootfs
@ 2011-12-15 7:13 Matt Evans
0 siblings, 0 replies; only message in thread
From: Matt Evans @ 2011-12-15 7:13 UTC (permalink / raw)
To: Pekka Enberg; +Cc: Sasha Levin, Cyrill Gorcunov, Asias He, KVM list
It's useful to boot with no -d and no implicit 9p root, with --initrd.
Since commit eaf720b285947a6f4e29174d0eba1899de31d8ab, we die() failing
to create the 2nd stage custom rootfs. This patch doesn't try to set up
a custom rootfs by default if user specifies an initrd on the commandline.
Signed-off-by: Matt Evans <matt@ozlabs.org>
---
tools/kvm/builtin-run.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/tools/kvm/builtin-run.c b/tools/kvm/builtin-run.c
index 0879ab9..c4329ea 100644
--- a/tools/kvm/builtin-run.c
+++ b/tools/kvm/builtin-run.c
@@ -973,7 +973,7 @@ int kvm_cmd_run(int argc, const char **argv, const char *prefix)
if (kernel_cmdline)
strlcat(real_cmdline, kernel_cmdline, sizeof(real_cmdline));
- if (!using_rootfs && !image_filename[0]) {
+ if (!using_rootfs && !image_filename[0] && !initrd_filename) {
char tmp[PATH_MAX];
kvm_setup_create_new("default");
--
1.7.0.4
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2011-12-15 7:13 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-12-15 7:13 [PATCH] kvm tools: Fix running with --initrd and no real discs/rootfs Matt Evans
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).