shaba/ostree
1
0
Fork 0
mirror of https://github.com/ostreedev/ostree.git synced 2024-12-22 17:35:55 +03:00
Code Issues Projects Releases Wiki Activity

syslinux: Avoid double /boot if bootprefix is enabled

Browse Source 
This backend always explicitly emitted a `/boot` - but if
the global `sysroot.bootprefix` is enabled, then we can rely
on the outer code doing it.

Luckily this was caught by the unit tests here failing when
enabling `sysroot.bootprefix` by default.
This commit is contained in:
Colin Walters 2024-02-05 15:01:40 -05:00
parent 740413168f
commit a05dbb311e
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/libostree/ostree-bootloader-syslinux.c
View File

@ -18,6 +18,7 @@
#include "config.h"
#include "ostree-bootloader-syslinux.h"
#include "ostree-repo-private.h"
#include "ostree-sysroot-private.h"
#include "otutil.h"
@ -84,15 +85,16 @@ append_config_from_loader_entries (OstreeBootloaderSyslinux *self, gboolean rege
val = ostree_bootconfig_parser_get (config, "linux");
if (!val)
return glnx_throw (error, "No \"linux\" key in bootloader config");
g_ptr_array_add (new_lines, g_strdup_printf ("\tKERNEL /boot%s", val));
const char *prefix = self->sysroot->repo->enable_bootprefix ? "" : "/boot";
g_ptr_array_add (new_lines, g_strdup_printf ("\tKERNEL %s%s", prefix, val));
val = ostree_bootconfig_parser_get (config, "initrd");
if (val)
g_ptr_array_add (new_lines, g_strdup_printf ("\tINITRD /boot%s", val));
g_ptr_array_add (new_lines, g_strdup_printf ("\tINITRD %s%s", prefix, val));
val = ostree_bootconfig_parser_get (config, "devicetree");
if (val)
g_ptr_array_add (new_lines, g_strdup_printf ("\tDEVICETREE /boot%s", val));
g_ptr_array_add (new_lines, g_strdup_printf ("\tDEVICETREE %s%s", prefix, val));
val = ostree_bootconfig_parser_get (config, "options");
if (val)