fix 2.6.31 compile with union mounts disabled

[openwrt.git] / target / linux / x86 / image / Config.in

diff --git a/target/linux/x86/image/Config.in b/target/linux/x86/image/Config.in
index af4f9a3..bf14267 100644 (file)
--- a/target/linux/x86/image/Config.in
+++ b/target/linux/x86/image/Config.in
@@ -22,7 +22,8 @@ config X86_GRUB_KERNELPART
 config X86_GRUB_ROOTPART
     string
     prompt "Root partition on target device" if X86_GRUB_IMAGES
 config X86_GRUB_ROOTPART
     string
     prompt "Root partition on target device" if X86_GRUB_IMAGES

-    default "/dev/hda2"
+    default "/dev/hda2" if LINUX_2_6_28
+    default "/dev/sda2"

     help
         The root partition on the final device.  If you don't know,
         you probably want the default (/dev/hda2).
     help
         The root partition on the final device.  If you don't know,
         you probably want the default (/dev/hda2).


@@ -36,10 +37,15 @@ config X86_GRUB_BOOTOPTS
 
 
 config X86_VDI_IMAGES
 
 
 config X86_VDI_IMAGES

-    bool "Build VirtuBox image files (VDI). Requires vditool"
+    bool "Build VirtualBox image files (VDI). Requires VBoxManage"

     depends TARGET_x86
     depends TARGET_ROOTFS_EXT2FS
     depends X86_GRUB_IMAGES
     select PACKAGE_kmod-pcnet32
 
     depends TARGET_x86
     depends TARGET_ROOTFS_EXT2FS
     depends X86_GRUB_IMAGES
     select PACKAGE_kmod-pcnet32
 

-
+config X86_VMDK_IMAGES
+    bool "Build VMware image files (VMDK). Requires qemu-img"
+    depends TARGET_x86
+    depends TARGET_ROOTFS_EXT2FS
+    depends X86_GRUB_IMAGES
+    select PACKAGE_kmod-e1000