From: Lennart Poettering <lennart@poettering.net>
Date: Wed, 10 Jul 2019 14:18:28 +0000 (+0200)
Subject: generator: downgrade Requires= → Wants= of fsck from /usr mount unit
X-Git-Tag: v243-rc1~158^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F13010%2Fhead;p=thirdparty%2Fsystemd.git

generator: downgrade Requires= → Wants= of fsck from /usr mount unit

Fixes #5099
---

diff --git a/src/shared/generator.c b/src/shared/generator.c
index 6524d983007..5b571681f28 100644
--- a/src/shared/generator.c
+++ b/src/shared/generator.c
@@ -164,7 +164,7 @@ int generator_write_fsck_deps(
 
         } else {
                 _cleanup_free_ char *_fsck = NULL;
-                const char *fsck;
+                const char *fsck, *dep;
 
                 if (in_initrd() && path_equal(where, "/sysroot")) {
                         r = write_fsck_sysroot_service(dir, what);
@@ -172,7 +172,15 @@ int generator_write_fsck_deps(
                                 return r;
 
                         fsck = SPECIAL_FSCK_ROOT_SERVICE;
+                        dep = "Requires";
                 } else {
+                        /* When this is /usr, then let's add a Wants= dependency, otherwise a Requires=
+                         * dependency. Why? We can't possibly unmount /usr during shutdown, but if we have a
+                         * Requires= from /usr onto a fsck@.service unit and that unit is shut down, then
+                         * we'd have to unmount /usr too.  */
+
+                        dep = !in_initrd() && path_equal(where, "/usr") ? "Wants" : "Requires";
+
                         r = unit_name_from_path_instance("systemd-fsck", what, ".service", &_fsck);
                         if (r < 0)
                                 return log_error_errno(r, "Failed to create fsck service name: %m");
@@ -181,9 +189,9 @@ int generator_write_fsck_deps(
                 }
 
                 fprintf(f,
-                        "Requires=%1$s\n"
-                        "After=%1$s\n",
-                        fsck);
+                        "%1$s=%2$s\n"
+                        "After=%2$s\n",
+                        dep, fsck);
         }
 
         return 0;