From b56c4c19c8d0adca67eb34e1924d881e7d61b97f Mon Sep 17 00:00:00 2001

From: =?UTF-8?q?Abd=C3=B3=20Roig-Maranges?= <abdo.roig@gmail.com>

Date: Mon, 31 Jul 2017 12:32:09 +0200

Subject: [PATCH] core: Do not fail perpetual mount units without fragment

 (#6459)

mount_load does not require fragment files to be present in order to

load mount units which are perpetual, or come from /proc/self/mountinfo.

mount_verify should do the same, otherwise a synthesized '-.mount' would

be marked as failed with "No such file or directory", as it is perpetual

but not marked to come from /proc/self/mountinfo at this point.

This happens for the user instance, and I suspect it was the cause of #5375

for the system instance, without gpt-generator.

(cherry picked from commit 1df96fcb31b3bc30c4a983de4734f61ed5a29115)

---

 src/core/mount.c | 2 +-

 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/core/mount.c b/src/core/mount.c

index 214364d87d..7d9644e305 100644

--- a/src/core/mount.c

+++ b/src/core/mount.c

@@ -503,7 +503,7 @@ static int mount_verify(Mount *m) {

         if (UNIT(m)->load_state != UNIT_LOADED)

                 return 0;

-        if (!m->from_fragment && !m->from_proc_self_mountinfo)

+        if (!m->from_fragment && !m->from_proc_self_mountinfo && !UNIT(m)->perpetual)

                 return -ENOENT;

         r = unit_name_from_path(m->where, ".mount", &e);