upgrade: Fix to actually deploy on change

2014-03-25 08:21:25 -04:00 · 2014-03-25 08:21:25 -04:00 · 60a00a8544
commit 60a00a8544
parent c2b242f200
1 changed files with 8 additions and 4 deletions
--- a/src/rpmostree-builtin-upgrade.c
+++ b/src/rpmostree-builtin-upgrade.c
@ -127,11 +127,15 @@ rpmostree_builtin_upgrade (int             argc,
    {
      g_print ("No update available.\n");
    }
-  else if (opt_reboot)
+  else
    {
-      gs_subprocess_simple_run_sync (NULL, GS_SUBPROCESS_STREAM_DISPOSITION_INHERIT,
-                                     cancellable, error,
-                                     "systemctl", "reboot", NULL);
+      if (!ostree_sysroot_upgrader_deploy (upgrader, cancellable, error))
+        goto out;
+
+      if (opt_reboot)
+        gs_subprocess_simple_run_sync (NULL, GS_SUBPROCESS_STREAM_DISPOSITION_INHERIT,
+                                       cancellable, error,
+                                       "systemctl", "reboot", NULL);
    }
  
  ret = TRUE;