Merge pull request #3389 from jlebon/pr/drop-finalize-staged-path

boot: Drop ostree-finalize-staged.path

Author: cgwalters

Makefile-boot.am

@@ -40,7 +40,6 @@ systemdsystemunit_DATA = src/boot/ostree-prepare-root.service \
 	src/boot/ostree-remount.service \
 	src/boot/ostree-boot-complete.service \
 	src/boot/ostree-finalize-staged.service \
-	src/boot/ostree-finalize-staged.path \
 	src/boot/ostree-finalize-staged-hold.service \
 	src/boot/ostree-state-overlay@.service \
 	$(NULL)
@@ -69,7 +68,6 @@ EXTRA_DIST += src/boot/dracut/module-setup.sh \
 	src/boot/mkinitcpio \
 	src/boot/ostree-boot-complete.service \
 	src/boot/ostree-prepare-root.service \
-	src/boot/ostree-finalize-staged.path \
 	src/boot/ostree-remount.service \
 	src/boot/ostree-finalize-staged.service \
 	src/boot/ostree-finalize-staged-hold.service \

src/boot/ostree-finalize-staged.path

@@ -111,10 +111,6 @@ require_internal_units (const char *normal_dir, const char *early_dir, const cha
 
   if (!glnx_shutil_mkdir_p_at (normal_dir_dfd, "multi-user.target.wants", 0755, cancellable, error))
     return FALSE;
-  if (symlinkat (SYSTEM_DATA_UNIT_PATH "/ostree-finalize-staged.path", normal_dir_dfd,
-                 "multi-user.target.wants/ostree-finalize-staged.path")
-      < 0)
-    return glnx_throw_errno_prefix (error, "symlinkat");
   if (symlinkat (SYSTEM_DATA_UNIT_PATH "/ostree-boot-complete.service", normal_dir_dfd,
                  "multi-user.target.wants/ostree-boot-complete.service")
       < 0)

src/libostree/ostree-impl-system-generator.c

@@ -3785,6 +3785,15 @@ ostree_sysroot_stage_tree_with_options (OstreeSysroot *self, const char *osname,
   if (booted_deployment == NULL)
     return glnx_prefix_error (error, "Cannot stage deployment");
 
+  const char *const systemctl_argv[]
+      = { "systemctl", "start", "ostree-finalize-staged.service", NULL };
+  int estatus;
+  if (!g_spawn_sync (NULL, (char **)systemctl_argv, NULL, G_SPAWN_SEARCH_PATH, NULL, NULL, NULL,
+                     NULL, &estatus, error))
+    return FALSE;
+  if (!g_spawn_check_exit_status (estatus, error))
+    return FALSE;
+
   g_autoptr (OstreeDeployment) deployment = NULL;
   if (!sysroot_initialize_deployment (self, osname, revision, origin, opts, &deployment,
                                       cancellable, error))

src/libostree/ostree-sysroot-deploy.c

@@ -12,7 +12,6 @@ case "${AUTOPKGTEST_REBOOT_MARK:-}" in
   sed -i -e 's,gpg-verify=true,gpg-verify=false,' /etc/ostree/remotes.d/*.conf
 
   # Test our generator
-  test -f /run/systemd/generator/multi-user.target.wants/ostree-finalize-staged.path
   test -f /run/systemd/generator/local-fs.target.requires/ostree-remount.service
 
   cat >/etc/systemd/system/sock-to-ignore.socket << 'EOF'
@@ -49,11 +48,8 @@ EOF
     ostree commit --no-bindings --parent="${commit}" -b staged-deploy -I --consume t
     newcommit=$(ostree rev-parse staged-deploy)
     orig_mtime=$(stat -c '%.Y' /sysroot/ostree/deploy)
-    systemctl show -p SubState ostree-finalize-staged.path | grep -q waiting
     systemctl show -p ActiveState ostree-finalize-staged.service | grep -q inactive
-    systemctl show -p TriggeredBy ostree-finalize-staged.service | grep -q path
     ostree admin deploy --stage staged-deploy
-    systemctl show -p SubState ostree-finalize-staged.path | grep running
     systemctl show -p ActiveState ostree-finalize-staged.service | grep active
     new_mtime=$(stat -c '%.Y' /sysroot/ostree/deploy)
     test "${orig_mtime}" != "${new_mtime}"