Skip to content

Commit

Permalink
lib/deploy: Always append index to bootloader title
Browse files Browse the repository at this point in the history
Without this, a previous entry with a deployment version found from the
version metadata would not have it's entry changed when a new deployment
is installed. That's a problem with our grub implementation that will
continue to boot the previous entry as long as it can find its title.
Without appending the deployment index, it will never change.

https://phabricator.endlessm.com/T22114
  • Loading branch information
dbnicholson authored and Andre Moreira Magalhaes committed Sep 18, 2019
1 parent e2dcabd commit df86ed6
Showing 1 changed file with 1 addition and 4 deletions.
5 changes: 1 addition & 4 deletions src/libostree/ostree-sysroot-deploy.c
Original file line number Diff line number Diff line change
Expand Up @@ -1746,10 +1746,7 @@ install_deployment_kernel (OstreeSysroot *sysroot,
g_string_append_c (title_key, ':');
g_string_append (title_key, osname);
}
if (!(deployment_version && *deployment_version))
{
g_string_append_printf (title_key, ":%d", ostree_deployment_get_index (deployment));
}
g_string_append_printf (title_key, ":%d", ostree_deployment_get_index (deployment));
g_string_append_c (title_key, ')');
ostree_bootconfig_parser_set (bootconfig, "title", title_key->str);

Expand Down

0 comments on commit df86ed6

Please sign in to comment.