diff options
author | Patrick Ohly <patrick.ohly@intel.com> | 2015-09-03 20:42:32 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-09-06 15:26:25 +0100 |
commit | 6d7bcd4df5722f3ccebbbf73361838cb0a5dc0ee (patch) | |
tree | 71567c46291b06559731d451466d7d6cfb59a279 /meta/classes/gummiboot.bbclass | |
parent | 5d79814b0b9d4d0348dc36c0d9e003e4ba0bd367 (diff) | |
download | poky-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/gummiboot.bbclass')
-rw-r--r-- | meta/classes/gummiboot.bbclass | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/meta/classes/gummiboot.bbclass b/meta/classes/gummiboot.bbclass index dae19775c3..3d9c08bbc9 100644 --- a/meta/classes/gummiboot.bbclass +++ b/meta/classes/gummiboot.bbclass | |||
@@ -15,6 +15,9 @@ GUMMIBOOT_CFG ?= "${S}/loader.conf" | |||
15 | GUMMIBOOT_ENTRIES ?= "" | 15 | GUMMIBOOT_ENTRIES ?= "" |
16 | GUMMIBOOT_TIMEOUT ?= "10" | 16 | GUMMIBOOT_TIMEOUT ?= "10" |
17 | 17 | ||
18 | # Need UUID utility code. | ||
19 | inherit fs-uuid | ||
20 | |||
18 | efi_populate() { | 21 | efi_populate() { |
19 | DEST=$1 | 22 | DEST=$1 |
20 | 23 | ||
@@ -108,6 +111,7 @@ python build_efi_cfg() { | |||
108 | lb = "install-efi" | 111 | lb = "install-efi" |
109 | entrycfg.write('options LABEL=%s ' % lb) | 112 | entrycfg.write('options LABEL=%s ' % lb) |
110 | if append: | 113 | if append: |
114 | append = replace_rootfs_uuid(d, append) | ||
111 | entrycfg.write('%s' % append) | 115 | entrycfg.write('%s' % append) |
112 | entrycfg.write('\n') | 116 | entrycfg.write('\n') |
113 | entrycfg.close() | 117 | entrycfg.close() |