From 60a00a8544954997077718b1a9bc6fcdda7acf09 Mon Sep 17 00:00:00 2001 From: Colin Walters Date: Tue, 25 Mar 2014 08:21:25 -0400 Subject: [PATCH] upgrade: Fix to actually deploy on change --- src/rpmostree-builtin-upgrade.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/src/rpmostree-builtin-upgrade.c b/src/rpmostree-builtin-upgrade.c index 689fcfc1..452e2674 100644 --- 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;