From: Lennart Poettering <lennart@poettering.net>
Date: Tue, 21 Jan 2020 09:40:18 +0000 (+0100)
Subject: generator: order growfs for the root fs after systemd-remount-fs
X-Git-Tag: v245-rc1~87^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F14618%2Fhead;p=thirdparty%2Fsystemd.git

generator: order growfs for the root fs after systemd-remount-fs

Fixes: #14603
---

diff --git a/src/shared/generator.c b/src/shared/generator.c
index 06e1ab80312..1cf5887a60d 100644
--- a/src/shared/generator.c
+++ b/src/shared/generator.c
@@ -493,15 +493,21 @@ int generator_hook_up_growfs(
                 "BindsTo=%%i.mount\n"
                 "Conflicts=shutdown.target\n"
                 "After=%%i.mount\n"
-                "Before=shutdown.target %s\n"
+                "Before=shutdown.target %s\n",
+                program_invocation_short_name,
+                target);
+
+        if (empty_or_root(where)) /* Make sure the root fs is actually writable before we resize it */
+                fprintf(f,
+                        "After=systemd-remount-fs.service\n");
+
+        fprintf(f,
                 "\n"
                 "[Service]\n"
                 "Type=oneshot\n"
                 "RemainAfterExit=yes\n"
                 "ExecStart="SYSTEMD_GROWFS_PATH " %s\n"
                 "TimeoutSec=0\n",
-                program_invocation_short_name,
-                target,
                 escaped);
 
         return generator_add_symlink(dir, where_unit, "wants", unit);