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

syslinux: Adapt to bootloader UI changes

Browse Source 
This was a side-effect of the bootloader UI changes in bug 739416,
but should now be sufficiently future-proofed with code comments.
This commit is contained in:
Matthew Barnes 2014-11-09 19:54:37 -05:00
parent bbd3fd7a22
commit 5c9e83c02c
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -206,8 +206,14 @@ _ostree_bootloader_syslinux_write_config (OstreeBootloader *bootloader,
(g_str_has_prefix (line, "DEFAULT ")))
{
saw_default = TRUE;
if (g_str_has_prefix (line, "DEFAULT ostree:"))
regenerate_default = TRUE;
/* XXX Searching for patterns in the title is rather brittle,
* but this hack is at least noted in the code that builds
* the title to hopefully avoid regressions. */
if (g_str_has_prefix (line, "DEFAULT ostree:") || /* old format */
strstr (line, "(ostree") != NULL) /* new format */
{
regenerate_default = TRUE;
}
skip = TRUE;
}

3
src/libostree/ostree-sysroot-deploy.c
View File

@ -1365,6 +1365,9 @@ install_deployment_kernel (OstreeSysroot *sysroot,
}
}
/* XXX The SYSLINUX bootloader backend actually parses the title string
* (specifically, it looks for the substring "(ostree"), so further
* changes to the title format may require updating that backend. */
title_key = g_string_new (val);
if (deployment_version && *deployment_version)
{