From: Lennart Poettering <lennart@poettering.net>
Date: Fri, 17 Jan 2020 14:09:01 +0000 (+0100)
Subject: mount: make checks on perpetual mount units more lax
X-Git-Tag: v245-rc1~107^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F14596%2Fhead;p=thirdparty%2Fsystemd.git

mount: make checks on perpetual mount units more lax

We don#t really care where perpetual mounts are mounted from, since they
have to exist since before we run anyway.
---

diff --git a/src/core/mount.c b/src/core/mount.c
index 12b2e512e82..668c4d7e895 100644
--- a/src/core/mount.c
+++ b/src/core/mount.c
@@ -537,10 +537,9 @@ static int mount_verify(Mount *m) {
         }
 
         p = get_mount_parameters_fragment(m);
-        if (p && !p->what) {
-                log_unit_error(UNIT(m), "What= setting is missing. Refusing.");
-                return -ENOEXEC;
-        }
+        if (p && !p->what && !UNIT(m)->perpetual)
+                return log_unit_error_errno(UNIT(m), SYNTHETIC_ERRNO(ENOEXEC),
+                                            "What= setting is missing. Refusing.");
 
         if (m->exec_context.pam_name && m->kill_context.kill_mode != KILL_CONTROL_GROUP) {
                 log_unit_error(UNIT(m), "Unit has PAM enabled. Kill mode must be set to control-group'. Refusing.");