From: Lennart Poettering <lennart@poettering.net>
Date: Tue, 18 Sep 2012 16:59:01 +0000 (+0200)
Subject: automount: also whine if an automount directory is not empty
X-Git-Tag: v190~28
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=e872b43c7ee51efb6bd6ca31d79e02af8cc3cb82

automount: also whine if an automount directory is not empty
---

diff --git a/src/core/automount.c b/src/core/automount.c
index c4a75280f..c9b87d517 100644
--- a/src/core/automount.c
+++ b/src/core/automount.c
@@ -501,6 +501,9 @@ static void automount_enter_waiting(Automount *a) {
         /* We knowingly ignore the results of this call */
         mkdir_p_label(a->where, 0555);
 
+        if (dir_is_empty(a->where) <= 0)
+                log_notice("%s: Directory %s to mount over is not empty, ignoring. (To see the over-mounted files, please manually mount the underlying file system to a secondary location.)", a->meta.id, a->where);
+
         if (pipe2(p, O_NONBLOCK|O_CLOEXEC) < 0) {
                 r = -errno;
                 goto fail;