From: Lennart Poettering <lennart@poettering.net>
Date: Fri, 17 Jan 2020 14:02:13 +0000 (+0100)
Subject: core: never allow perpetual units to be masked
X-Git-Tag: archive/raspbian/244.1-1+rpi1^2~20
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=36cd395d49a1aaa628931512d04919babd09d857;p=systemd.git

core: never allow perpetual units to be masked

Fixes: #14550
(cherry picked from commit 88414eed6f45f738ae765d9f72d67c6dc5a51950)

Gbp-Pq: Name core-never-allow-perpetual-units-to-be-masked.patch
---

diff --git a/src/core/load-fragment.c b/src/core/load-fragment.c
index 1679e047..95345668 100644
--- a/src/core/load-fragment.c
+++ b/src/core/load-fragment.c
@@ -4702,7 +4702,9 @@ int unit_load_fragment(Unit *u) {
                         return r;
 
                 if (null_or_empty(&st)) {
-                        u->load_state = UNIT_MASKED;
+                        /* Unit file is masked */
+
+                        u->load_state = u->perpetual ? UNIT_LOADED : UNIT_MASKED; /* don't allow perpetual units to ever be masked */
                         u->fragment_mtime = 0;
                 } else {
                         u->load_state = UNIT_LOADED;