projects
/
openwrt
/
staging
/
dedeckeh.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
9d74fc3
)
adjust image defaults for KVM
author
Jo-Philipp Wich
<jow@openwrt.org>
Mon, 6 Sep 2010 02:31:37 +0000
(
02:31
+0000)
committer
Jo-Philipp Wich
<jow@openwrt.org>
Mon, 6 Sep 2010 02:31:37 +0000
(
02:31
+0000)
SVN-Revision: 22950
target/linux/x86/image/Config.in
patch
|
blob
|
history
diff --git
a/target/linux/x86/image/Config.in
b/target/linux/x86/image/Config.in
index 308f85cca49847579d8b8d9c96d91adfcbc850a0..ac7510edbc2f52f2fadcd05bd773cb97822a34bf 100644
(file)
--- 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
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"
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
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/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).
help
The root partition on the final device. If you don't know,
you probably want the default (/dev/sda2).