summaryrefslogtreecommitdiffstats
path: root/meta/classes/grub-efi.bbclass
diff options
context:
space:
mode:
authorPatrick Ohly <patrick.ohly@intel.com>2015-09-03 20:42:32 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-09-06 15:26:25 +0100
commit6d7bcd4df5722f3ccebbbf73361838cb0a5dc0ee (patch)
tree71567c46291b06559731d451466d7d6cfb59a279 /meta/classes/grub-efi.bbclass
parent5d79814b0b9d4d0348dc36c0d9e003e4ba0bd367 (diff)
downloadpoky-6d7bcd4df5722f3ccebbbf73361838cb0a5dc0ee.tar.gz
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=<<uuid-of-rootfs>>". 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 <patrick.ohly@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes/grub-efi.bbclass')
-rw-r--r--meta/classes/grub-efi.bbclass4
1 files changed, 4 insertions, 0 deletions
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"
26 26
27EFIDIR = "/EFI/BOOT" 27EFIDIR = "/EFI/BOOT"
28 28
29# Need UUID utility code.
30inherit fs-uuid
31
29efi_populate() { 32efi_populate() {
30 # DEST must be the root of the image so that EFIDIR is not 33 # DEST must be the root of the image so that EFIDIR is not
31 # nested under a top level directory. 34 # nested under a top level directory.
@@ -129,6 +132,7 @@ python build_efi_cfg() {
129 initrd = localdata.getVar('INITRD', True) 132 initrd = localdata.getVar('INITRD', True)
130 133
131 if append: 134 if append:
135 append = replace_rootfs_uuid(d, append)
132 cfgfile.write('%s' % (append)) 136 cfgfile.write('%s' % (append))
133 cfgfile.write(' %s' % btype[1]) 137 cfgfile.write(' %s' % btype[1])
134 cfgfile.write('\n') 138 cfgfile.write('\n')