diff options
| author | William Manley <will@stb-tester.com> | 2020-07-15 15:40:14 +0100 |
|---|---|---|
| committer | William Manley <will@stb-tester.com> | 2020-07-15 20:37:49 +0100 |
| commit | 0ced9fde7649271d9458ca424aa8c41908634b02 (patch) | |
| tree | c9e3d8d1d7652f3c17faed8556eda4264b3b4b10 /src/libostree/ostree-bootloader-uboot.c | |
| parent | 4deb426835d234eaa55046175f7dffaea7864fdb (diff) | |
| download | ostree-0ced9fde7649271d9458ca424aa8c41908634b02.tar.gz | |
sysroot: Support /boot on root or as seperate filesystem for syslinux and u-boot
We use a similar trick to having a `sysroot -> .` symlink on the real root
here to support both /boot on root as well as on a separate filesystem. No
matter how it's mounted `/boot/xyz` will always refer to the file you'd
expect.
This is nicer than my previous attempts at this because there's no
configuration nor auto-detection required.
Diffstat (limited to 'src/libostree/ostree-bootloader-uboot.c')
| -rw-r--r-- | src/libostree/ostree-bootloader-uboot.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/libostree/ostree-bootloader-uboot.c b/src/libostree/ostree-bootloader-uboot.c index 1e1f0371..7e23001e 100644 --- a/src/libostree/ostree-bootloader-uboot.c +++ b/src/libostree/ostree-bootloader-uboot.c @@ -134,19 +134,19 @@ create_config_from_boot_loader_entries (OstreeBootloaderUboot *self, "No \"linux\" key in bootloader config"); return FALSE; } - g_ptr_array_add (new_lines, g_strdup_printf ("kernel_image%s=%s", index_suffix, val)); + g_ptr_array_add (new_lines, g_strdup_printf ("kernel_image%s=/boot%s", index_suffix, val)); val = ostree_bootconfig_parser_get (config, "initrd"); if (val) - g_ptr_array_add (new_lines, g_strdup_printf ("ramdisk_image%s=%s", index_suffix, val)); + g_ptr_array_add (new_lines, g_strdup_printf ("ramdisk_image%s=/boot%s", index_suffix, val)); val = ostree_bootconfig_parser_get (config, "devicetree"); if (val) - g_ptr_array_add (new_lines, g_strdup_printf ("fdt_file%s=%s", index_suffix, val)); + g_ptr_array_add (new_lines, g_strdup_printf ("fdt_file%s=/boot%s", index_suffix, val)); val = ostree_bootconfig_parser_get (config, "fdtdir"); if (val) - g_ptr_array_add (new_lines, g_strdup_printf ("fdtdir%s=%s", index_suffix, val)); + g_ptr_array_add (new_lines, g_strdup_printf ("fdtdir%s=/boot%s", index_suffix, val)); val = ostree_bootconfig_parser_get (config, "options"); if (val) |