chiark / gitweb /
automount: also whine if an automount directory is not empty
authorLennart Poettering <lennart@poettering.net>
Tue, 18 Sep 2012 16:59:01 +0000 (18:59 +0200)
committerLennart Poettering <lennart@poettering.net>
Tue, 18 Sep 2012 16:59:01 +0000 (18:59 +0200)
src/core/automount.c

index c4a7528..c9b87d5 100644 (file)
@@ -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;