diff options
| author | Jo-Philipp Wich <jow@openwrt.org> | 2015-03-24 10:08:12 +0000 |
|---|---|---|
| committer | Jo-Philipp Wich <jow@openwrt.org> | 2015-03-24 10:08:12 +0000 |
| commit | 463bc01f6d318325e1cfebd67b1852e081d687d8 (patch) | |
| tree | 76301a6be6c4fe507be53147d7f007e76f013ff5 /target/linux/x86/image/gen_image_generic.sh | |
| parent | 658472564b1fde25940ee544b84cf2605598edfb (diff) | |
| download | upstream-463bc01f6d318325e1cfebd67b1852e081d687d8.tar.gz upstream-463bc01f6d318325e1cfebd67b1852e081d687d8.tar.bz2 upstream-463bc01f6d318325e1cfebd67b1852e081d687d8.zip | |
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>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@44966 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/x86/image/gen_image_generic.sh')
| -rwxr-xr-x | target/linux/x86/image/gen_image_generic.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/target/linux/x86/image/gen_image_generic.sh b/target/linux/x86/image/gen_image_generic.sh index 9d11efbb05..3fb31f6e40 100755 --- a/target/linux/x86/image/gen_image_generic.sh +++ b/target/linux/x86/image/gen_image_generic.sh @@ -20,7 +20,7 @@ sect=63 cyl=$(( ($KERNELSIZE + $ROOTFSSIZE) * 1024 * 1024 / ($head * $sect * 512))) # create partition table -set `ptgen -o "$OUTPUT" -h $head -s $sect -p ${KERNELSIZE}m -p ${ROOTFSSIZE}m ${ALIGN:+-l $ALIGN}` +set `ptgen -o "$OUTPUT" -h $head -s $sect -p ${KERNELSIZE}m -p ${ROOTFSSIZE}m ${ALIGN:+-l $ALIGN} ${SIGNATURE:+-S 0x$SIGNATURE}` KERNELOFFSET="$(($1 / 512))" KERNELSIZE="$(($2 / 512))" |