From 84c3ecfb7f0d10981b82ce311d20217479096946 Mon Sep 17 00:00:00 2001
From: jow <jow@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Mon, 6 Sep 2010 02:31:37 +0000
Subject: [x86] adjust image defaults for KVM

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@22950 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 target/linux/x86/image/Config.in | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'target/linux/x86')

diff --git a/target/linux/x86/image/Config.in b/target/linux/x86/image/Config.in
index 308f85cca..ac7510edb 100644
--- a/target/linux/x86/image/Config.in
+++ b/target/linux/x86/image/Config.in
@@ -14,8 +14,8 @@ config X86_GRUB_CONSOLE
 config X86_GRUB_SERIAL
 	string "Serial port device"
 	depends X86_GRUB_IMAGES
-	default "hvc0" if TARGET_x86_xen_domu
-	default "ttyS0"
+	default "hvc0" if (TARGET_x86_kvm_guest || TARGET_x86_xen_domu)
+	default "ttyS0" if ! (TARGET_x86_kvm_guest || TARGET_x86_xen_domu)
 
 config X86_GRUB_BAUDRATE
 	int "Serial port baud rate"
@@ -63,8 +63,9 @@ config TARGET_KERNEL_PARTSIZE
 config TARGET_ROOTFS_PARTNAME
 	string "Root partition on target device"
 	depends OLPC_BOOTSCRIPT_IMAGES || X86_GRUB_IMAGES
+	default "/dev/vda2" if TARGET_x86_kvm_guest
 	default "/dev/xvda2" if TARGET_x86_xen_domu
-	default "/dev/sda2"
+	default "/dev/sda2" if ! (TARGET_x86_kvm_guest || TARGET_x86_xen_domu)
 	help
 	  The root partition on the final device.  If you don't know,
 	  you probably want the default (/dev/sda2).
-- 
cgit v1.2.3