prepare-root: Tidy code for root_upperdir and root_workdir

ostreedev · Dec 20, 2024 · 627b4f8 · 627b4f8
1 parent 01de3ea
commit 627b4f8
Showing 1 changed file with 7 additions and 7 deletions.
diff --git a/src/switchroot/ostree-prepare-root.c b/src/switchroot/ostree-prepare-root.c
@@ -444,16 +444,16 @@ main (int argc, char *argv[])
 
       g_autofree char *expected_digest = NULL;
 
-      // For now we just stick the transient root on the default /run tmpfs;
-      // however, see
-      // https://github.com/systemd/systemd/blob/604b2001081adcbd64ee1fbe7de7a6d77c5209fe/src/basic/mountpoint-util.h#L36
-      // which bumps up these defaults for the rootfs a bit.
-      const char *root_upperdir = OTCORE_RUN_OSTREE_PRIVATE "/root/upper";
-      const char *root_workdir = OTCORE_RUN_OSTREE_PRIVATE "/root/work";
-
       // Propagate these options for transient root, if provided
       if (root_transient)
         {
+          // For now we just stick the transient root on the default /run tmpfs;
+          // however, see
+          // https://github.com/systemd/systemd/blob/604b2001081adcbd64ee1fbe7de7a6d77c5209fe/src/basic/mountpoint-util.h#L36
+          // which bumps up these defaults for the rootfs a bit.
+          const char *root_upperdir = OTCORE_RUN_OSTREE_PRIVATE "/root/upper";
+          const char *root_workdir = OTCORE_RUN_OSTREE_PRIVATE "/root/work";
+
           if (!glnx_shutil_mkdir_p_at (AT_FDCWD, root_upperdir, 0755, NULL, &error))
             errx (EXIT_FAILURE, "Failed to create %s: %s", root_upperdir, error->message);
           if (!glnx_shutil_mkdir_p_at (AT_FDCWD, root_workdir, 0700, NULL, &error))