From: Andrei Gherzan <andrei@gherzan.com>
Date: Tue, 6 Feb 2018 15:35:52 +0000 (+0000)
Subject: core: Avoid empty directory warning when we are bind-mounting a file (#8069)
X-Git-Tag: v238~136
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3f602115b71e8dcbdf34f7193ecf91fc2506daa2;p=thirdparty%2Fsystemd.git

core: Avoid empty directory warning when we are bind-mounting a file (#8069)
---

diff --git a/src/core/unit.c b/src/core/unit.c
index 4a5fa4005ca..5a17efdbcbb 100644
--- a/src/core/unit.c
+++ b/src/core/unit.c
@@ -4726,7 +4726,7 @@ void unit_warn_if_dir_nonempty(Unit *u, const char* where) {
         assert(where);
 
         r = dir_is_empty(where);
-        if (r > 0)
+        if (r > 0 || r == -ENOTDIR)
                 return;
         if (r < 0) {
                 log_unit_warning_errno(u, r, "Failed to check directory %s: %m", where);