Revert "apply: Use staged deployment on booted systems"

This reverts commit 12d263b. On systems
such as PAYG where `/boot` is an automount,
`ostree-finalize-staged.service` fails to work correctly if the
automount expires before shutdown. Until a solution to that issue is
found, go back to the non-staged deployments we've used for years.

https://phabricator.endlessm.com/T5658
systemd/systemd#22528
ostreedev/ostree#2543

eos-updater/apply.c

@@ -241,7 +241,6 @@ apply_internal (ApplyData     *apply_data,
   g_autoptr(GKeyFile) origin = NULL;
   g_autoptr(OstreeSysroot) sysroot = NULL;
   const gchar *osname = get_test_osname ();
-  gboolean staged_deploy;
   g_autoptr(GError) local_error = NULL;
 
   sysroot = ostree_sysroot_new_default ();
@@ -270,62 +269,21 @@ apply_internal (ApplyData     *apply_data,
 
   origin = ostree_sysroot_origin_new_from_refspec (sysroot, update_refspec);
 
-  /* When booted into an OSTree system, stage the deployment so that the
-   * /etc merge happens during shutdown. Otherwise (primarily the test
-   * suite), deploy the finalized tree immediately.
-   */
-  staged_deploy = ostree_sysroot_is_booted (sysroot);
-  if (staged_deploy)
-    {
-      g_message ("Creating staged deployment for revision %s", update_id);
-      if (!ostree_sysroot_stage_tree (sysroot,
-                                      osname,
-                                      update_id,
-                                      origin,
-                                      booted_deployment,
-                                      NULL,
-                                      &new_deployment,
-                                      cancellable,
-                                      error))
-        return FALSE;
-    }
-  else
-    {
-      g_message ("Creating finalized deployment for revision %s", update_id);
-      if (!ostree_sysroot_deploy_tree (sysroot,
-                                       osname,
-                                       update_id,
-                                       origin,
-                                       booted_deployment,
-                                       NULL,
-                                       &new_deployment,
-                                       cancellable,
-                                       error))
-        return FALSE;
-
-      if (!ostree_sysroot_simple_write_deployment (sysroot,
-                                                   osname,
-                                                   new_deployment,
-                                                   booted_deployment,
-                                                   OSTREE_SYSROOT_SIMPLE_WRITE_DEPLOYMENT_FLAGS_NO_CLEAN,
-                                                   cancellable,
-                                                   error))
-        return FALSE;
-    }
-
-  g_message ("New deployment: index: %d, OS name: %s, deploy serial: %d, "
-             "checksum: %s, boot checksum: %s, boot serial: %d",
-             ostree_deployment_get_index (new_deployment),
-             ostree_deployment_get_osname (new_deployment),
-             ostree_deployment_get_deployserial (new_deployment),
-             ostree_deployment_get_csum (new_deployment),
-             ostree_deployment_get_bootcsum (new_deployment),
-             ostree_deployment_get_bootserial (new_deployment));
+  if (!ostree_sysroot_deploy_tree (sysroot,
+                                   osname,
+                                   update_id,
+                                   origin,
+                                   booted_deployment,
+                                   NULL,
+                                   &new_deployment,
+                                   cancellable,
+                                   error))
+    return FALSE;
 
   /* If the original refspec is not the update refspec, then we may have
    * a ref to a no longer needed tree. Delete that remote ref so the
-   * sysroot cleanup below really removes that tree if no deployments
-   * point to it anymore.
+   * cleanup done in simple_write_deployment() really removes that tree
+   * if no deployments point to it anymore.
    */
   if (g_strcmp0 (update_refspec, orig_refspec) != 0)
     {
@@ -346,6 +304,24 @@ apply_internal (ApplyData     *apply_data,
         }
     }
 
+  if (!ostree_sysroot_simple_write_deployment (sysroot,
+                                               osname,
+                                               new_deployment,
+                                               booted_deployment,
+                                               OSTREE_SYSROOT_SIMPLE_WRITE_DEPLOYMENT_FLAGS_NO_CLEAN,
+                                               cancellable,
+                                               error))
+    return FALSE;
+
+  g_message ("New deployment: index: %d, OS name: %s, deploy serial: %d, "
+             "checksum: %s, boot checksum: %s, boot serial: %d",
+             ostree_deployment_get_index (new_deployment),
+             ostree_deployment_get_osname (new_deployment),
+             ostree_deployment_get_deployserial (new_deployment),
+             ostree_deployment_get_csum (new_deployment),
+             ostree_deployment_get_bootcsum (new_deployment),
+             ostree_deployment_get_bootserial (new_deployment));
+
   /* FIXME: Cleaning up after update should be non-fatal, since we've
    * already successfully deployed the new OS. This clearly is a
    * workaround for a more serious issue, likely related to concurrent