packaging
/
ostree
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

deploy: Only query bootloader if we have to make a loader change 

This will also help distinguish in the output when we're just swapping
bootlinks versus when we need to change the loader config.
This commit is contained in:
Colin Walters 2013-09-19 22:25:12 -04:00
parent d1bc9e2acf
commit ae68b8380f
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1016,7 +1016,6 @@ ostree_sysroot_write_deployments (OstreeSysroot *self,
gboolean ret = FALSE; gboolean ret = FALSE;
guint i; guint i;
gboolean requires_new_bootversion = FALSE; gboolean requires_new_bootversion = FALSE;
gs_unref_object OstreeBootloader *bootloader = _ostree_sysroot_query_bootloader (self);
g_assert (self->loaded); g_assert (self->loaded);
@ -1051,11 +1050,6 @@ ostree_sysroot_write_deployments (OstreeSysroot *self,
} }
} }
if (bootloader)
g_print ("Detected bootloader: %s\n", _ostree_bootloader_get_name (bootloader));
else
g_print ("Detected bootloader: (unknown)\n");
if (!requires_new_bootversion) if (!requires_new_bootversion)
{ {
if (!full_system_sync (cancellable, error)) if (!full_system_sync (cancellable, error))
@ -1075,6 +1069,13 @@ ostree_sysroot_write_deployments (OstreeSysroot *self,
else else
{ {
int new_bootversion = self->bootversion ? 0 : 1; int new_bootversion = self->bootversion ? 0 : 1;
gs_unref_object OstreeBootloader *bootloader = _ostree_sysroot_query_bootloader (self);
if (bootloader)
g_print ("Detected bootloader: %s\n", _ostree_bootloader_get_name (bootloader));
else
g_print ("Detected bootloader: (unknown)\n");
for (i = 0; i < new_deployments->len; i++) for (i = 0; i < new_deployments->len; i++)
{ {
OstreeDeployment *deployment = new_deployments->pdata[i]; OstreeDeployment *deployment = new_deployments->pdata[i];