From: Filipe Brandenburger <filbranden@google.com>
Date: Fri, 2 Mar 2018 01:48:15 +0000 (-0800)
Subject: install: detect masked unit with drop-ins
X-Git-Tag: v238~27^2~1
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=9639b1752cf97eeee93d2a3dbc8531d6d4d4bc2e;p=platform%2Fupstream%2Fsystemd.git

install: detect masked unit with drop-ins

Before this fix, a unit with drop-ins will not be reported as masked by
`systemctl is-enabled` or `systemctl list-unit-files`.
---

diff --git a/src/shared/install.c b/src/shared/install.c
index 01e2ebf..fb2231b 100644
--- a/src/shared/install.c
+++ b/src/shared/install.c
@@ -1461,6 +1461,9 @@ static int unit_file_search(
                 return -ENOENT;
         }
 
+        if (info->type == UNIT_FILE_TYPE_MASKED)
+                return result;
+
         /* Search for drop-in directories */
 
         dropin_dir_name = strjoina(info->name, ".d");