summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2012-09-18 18:59:01 +0200
committerLennart Poettering <lennart@poettering.net>2012-09-18 18:59:01 +0200
commite872b43c7ee51efb6bd6ca31d79e02af8cc3cb82 (patch)
treebbd7fd034446310a978eed9c42399e992a701150 /src
parent257f1d8ec49046c7b481801acfdd5bf57c9efa5c (diff)
automount: also whine if an automount directory is not empty
Diffstat (limited to 'src')
-rw-r--r--src/core/automount.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/core/automount.c b/src/core/automount.c
index c4a75280fc..c9b87d5174 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;