From: David Ahern Date: Tue, 5 Apr 2011 16:04:13 +0000 (-0600) Subject: kvm tools: do not append root=/dev/vda if passed via command line X-Git-Tag: next-20110824~3^2~499 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=eb5e0b2f9babdaeb71f4ea7aca2a0e7a69a394e2;p=karo-tx-linux.git kvm tools: do not append root=/dev/vda if passed via command line Hardcoding the root= option prevents an existing qemu-kvm based disk image using LVM from booting. It fails to find the root filesystem. By making the root parameter optional if given on the command line, the image boots correctly. For example, ./kvm --kernel=/tmp/vmlinuz-2.6.38 \ --initrd=/tmp/initramfs-2.6.38.img \ --image=/home/dsa/vm/images/f14/nkvm-f14.img \ --mem=1024 --params="ro root=/dev/mapper/vg_f14vm-lv_root" works now. Signed-off-by: David Ahern Signed-off-by: Pekka Enberg --- diff --git a/tools/kvm/main.c b/tools/kvm/main.c index d70b4466bb6f..3165bc7489fd 100644 --- a/tools/kvm/main.c +++ b/tools/kvm/main.c @@ -148,7 +148,10 @@ int main(int argc, char *argv[]) kvm__setup_cpuid(kvm); - strcpy(real_cmdline, "notsc nolapic nosmp noacpi pci=conf1 console=ttyS0 root=/dev/vda rw "); + strcpy(real_cmdline, "notsc nolapic nosmp noacpi pci=conf1 console=ttyS0 "); + if (!kernel_cmdline || (strstr(kernel_cmdline, "root=") == NULL)) + strlcat(real_cmdline, "root=/dev/vda rw ", sizeof(real_cmdline)); + if (kernel_cmdline) { strlcat(real_cmdline, kernel_cmdline, sizeof(real_cmdline)); real_cmdline[sizeof(real_cmdline)-1] = '\0';