Commit-ID: 4936458a233990d8198d6cd4a9ae1a6f426d1be7
Gitweb: http://git.kernel.org/tip/4936458a233990d8198d6cd4a9ae1a6f426d1be7
Author: Matt Evans <matt@xxxxxxxxxx>
AuthorDate: Thu, 15 Dec 2011 18:13:41 +1100
Committer: Pekka Enberg <penberg@xxxxxxxxxx>
CommitDate: Sat, 17 Dec 2011 09:26:45 +0200
kvm tools: Fix running with --initrd and no real discs/rootfs
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@xxxxxxxxxx>
Signed-off-by: Pekka Enberg <penberg@xxxxxxxxxx>
---
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");
--
To unsubscribe from this list: send the line "unsubscribe linux-tip-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
|