aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/x86/image
diff options
context:
space:
mode:
authorJo-Philipp Wich <jow@openwrt.org>2010-09-06 02:31:37 +0000
committerJo-Philipp Wich <jow@openwrt.org>2010-09-06 02:31:37 +0000
commit7d045509fd704c9751fe1f01608d76bfbf951084 (patch)
tree2a934168411ed6b7e19363355d0d691cece81cf5 /target/linux/x86/image
parent9d74fc3eb3c7c5c4f1d3db3271d59e733297c72f (diff)
downloadupstream-7d045509fd704c9751fe1f01608d76bfbf951084.tar.gz
upstream-7d045509fd704c9751fe1f01608d76bfbf951084.tar.bz2
upstream-7d045509fd704c9751fe1f01608d76bfbf951084.zip
adjust image defaults for KVM
SVN-Revision: 22950
Diffstat (limited to 'target/linux/x86/image')
-rw-r--r--target/linux/x86/image/Config.in7
1 files changed, 4 insertions, 3 deletions
diff --git a/target/linux/x86/image/Config.in b/target/linux/x86/image/Config.in
index 308f85cca4..ac7510edbc 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).