x86: use PARTUUID instead explicitly specifying the device by default

This changes the x86 image generation to match x86_64, using the PARTUUID for
the rootfs instead of explicitly configuring the device.

It unbreaks KVM with VirtIO, which uses /dev/vda2 instead of /dev/sda2.

Tested in QEMU/KVM with VirtIO, VirtualBox and VMware.

Signed-off-by: Matthias Schiffer <mschiffer@universe-factory.net>

SVN-Revision: 44966
This commit is contained in:
Jo-Philipp Wich
2015-03-24 10:08:12 +00:00
parent 5d9eeab64a
commit 02e2548b84
5 changed files with 57 additions and 42 deletions

View File

@@ -267,8 +267,6 @@ menu "Target Images"
config TARGET_ROOTFS_PARTNAME
string "Root partition on target device"
depends on OLPC_BOOTSCRIPT_IMAGES || GRUB_IMAGES
default "/dev/xvda2" if TARGET_x86_xen_domu
default "/dev/sda2" if TARGET_x86 && ! TARGET_x86_xen_domu
help
Override the root partition on the final device. If left empty,
it will be mounted by PARTUUID which makes the kernel find the