pid1: do not warn if /run/systemd/relabel-extra.d/ doesn't exist
authorZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Wed, 18 Sep 2019 15:52:30 +0000 (17:52 +0200)
committerZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Thu, 10 Oct 2019 12:42:18 +0000 (14:42 +0200)
After all, that is the expected state.

(cherry picked from commit 90b059b608d6c53c8efb23b8791190dffadd1a17)

src/core/mount-setup.c

index fc6c5f6bef38c6f862877cc940e490882f879ffa..3ac01ff16e11f4987c1e9faded0b736947a2c41f 100644 (file)
@@ -495,8 +495,9 @@ static int relabel_extra(void) {
                         log_warning_errno(errno, "Failed to remove /run/systemd/relabel-extra.d/%s, ignoring: %m", de->d_name);
         }
 
-        /* Remove when we completing things. */
-        if (rmdir("/run/systemd/relabel-extra.d") < 0)
+        /* Remove when we complete things. */
+        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;