From 6d7bcd4df5722f3ccebbbf73361838cb0a5dc0ee Mon Sep 17 00:00:00 2001 From: Patrick Ohly Date: Thu, 3 Sep 2015 20:42:32 +0200 Subject: boot loader: support root=UUID As mentioned when introducing the VM images (https://bugzilla.yoctoproject.org/show_bug.cgi?id=7374), the resulting images only work when the image is mounted as a disk that results in the hard-coded path (/dev/sda in the current default). Using the file system UUID to find the rootfs is more flexible. To enable this for boot-direct.bbclass and thus image-vm.bbclass (aka FSTYPEs vdi/vmdk/qcow2), set SYSLINUX_ROOT = "root=UUID=<>". The rootfs image must use an ext file system. The special string will get replaced in the APPEND line with the actual UUID when the boot loader (grub-efi, syslinux or gummiboot) writes the boot loader configuration files. At that time, the rootfs image has already been created and its UUID can be extracted using "tune2fs -l", which also should be available because the e2fsprogs-native tools were needed to create the image in the first place. (From OE-Core rev: 1e29d77d0d33ee216b43022439876863f0db39bb) Signed-off-by: Patrick Ohly Signed-off-by: Richard Purdie --- meta/classes/grub-efi.bbclass | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'meta/classes/grub-efi.bbclass') diff --git a/meta/classes/grub-efi.bbclass b/meta/classes/grub-efi.bbclass index 6d58d48704..4ddc2bb125 100644 --- a/meta/classes/grub-efi.bbclass +++ b/meta/classes/grub-efi.bbclass @@ -26,6 +26,9 @@ GRUB_OPTS ?= "serial --unit=0 --speed=115200 --word=8 --parity=no --stop=1" EFIDIR = "/EFI/BOOT" +# Need UUID utility code. +inherit fs-uuid + efi_populate() { # DEST must be the root of the image so that EFIDIR is not # nested under a top level directory. @@ -129,6 +132,7 @@ python build_efi_cfg() { initrd = localdata.getVar('INITRD', True) if append: + append = replace_rootfs_uuid(d, append) cfgfile.write('%s' % (append)) cfgfile.write(' %s' % btype[1]) cfgfile.write('\n') -- cgit 1.2.3-korg