mirror of
https://git.yoctoproject.org/poky
synced 2026-05-08 17:19:20 +00:00
wic: Switch to using --use-uuid by default
The most portable way to specifiy a root device in a disk image that we create is to use PARTUUID rather than /dev/sda2. As background, both GPT and MBR tables provide valid UUID values for each partition and the Linux Kernel contains the logic to parse this value. With this change we can now boot the default disk images when used as any valid block device that the included kernel uses. This for example means that VirtualBox can be used to run vmdk without changes as it uses IDE for the virtual disk controller. Cc: Matt Porter <mporter@konsulko.com> (From OE-Core rev: 8a58e9bb3e76a9962f1d14a8bdd3f7de675c3492) Signed-off-by: Tom Rini <trini@konsulko.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
@@ -1,3 +1,3 @@
|
||||
# This file is included into 3 canned wks files from this directory
|
||||
part /boot --source bootimg-pcbios --ondisk sda --label boot --active --align 1024
|
||||
part / --source rootfs --ondisk sda --fstype=ext4 --label platform --align 1024
|
||||
part / --source rootfs --use-uuid --fstype=ext4 --label platform --align 1024
|
||||
|
||||
@@ -12,16 +12,16 @@ DEFAULT Graphics console boot
|
||||
|
||||
LABEL Graphics console boot
|
||||
KERNEL /vmlinuz
|
||||
APPEND label=boot root=/dev/sda2 rootwait
|
||||
APPEND label=boot rootwait
|
||||
|
||||
LABEL Serial console boot
|
||||
KERNEL /vmlinuz
|
||||
APPEND label=boot root=/dev/sda2 rootwait console=ttyS0,115200
|
||||
APPEND label=boot rootwait console=ttyS0,115200
|
||||
|
||||
LABEL Graphics console install
|
||||
KERNEL /vmlinuz
|
||||
APPEND label=install root=/dev/sda2 rootwait
|
||||
APPEND label=install rootwait
|
||||
|
||||
LABEL Serial console install
|
||||
KERNEL /vmlinuz
|
||||
APPEND label=install root=/dev/sda2 rootwait console=ttyS0,115200
|
||||
APPEND label=install rootwait console=ttyS0,115200
|
||||
|
||||
@@ -4,5 +4,5 @@
|
||||
|
||||
include common.wks.inc
|
||||
|
||||
bootloader --timeout=0 --append="vga=0 uvesafb.mode_option=640x480-32 root=/dev/sda2 rw mem=256M ip=192.168.7.2::192.168.7.1:255.255.255.0 oprofile.timer=1 rootfstype=ext4 "
|
||||
bootloader --timeout=0 --append="vga=0 uvesafb.mode_option=640x480-32 rw mem=256M ip=192.168.7.2::192.168.7.1:255.255.255.0 oprofile.timer=1 rootfstype=ext4 "
|
||||
|
||||
|
||||
Reference in New Issue
Block a user