From: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Date: Wed, 18 Sep 2019 15:52:30 +0000 (+0200)
Subject: pid1: do not warn if /run/systemd/relabel-extra.d/ doesn't exist
X-Git-Tag: v244-rc1~266^2~5
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=90b059b608d6c53c8efb23b8791190dffadd1a17;p=thirdparty%2Fsystemd.git

pid1: do not warn if /run/systemd/relabel-extra.d/ doesn't exist

After all, that is the expected state.
---

diff --git a/src/core/mount-setup.c b/src/core/mount-setup.c
index 72cf5a2caae..9d9263e8faf 100644
--- a/src/core/mount-setup.c
+++ b/src/core/mount-setup.c
@@ -469,7 +469,8 @@ static int relabel_extra(void) {
         }
 
         /* Remove when we complete things. */
-        if (rmdir("/run/systemd/relabel-extra.d") < 0)
+        if (rmdir("/run/systemd/relabel-extra.d") < 0 &&
+            errno != ENOENT)
                 log_warning_errno(errno, "Failed to remove /run/systemd/relabel-extra.d/ directory: %m");
 
         return c;