From: Lennart Poettering <lennart@poettering.net>
Date: Wed, 19 Sep 2012 07:55:56 +0000 (+0200)
Subject: mount: reword directory empty warning a bit
X-Git-Tag: v190~22
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=a99124d92f8a60215f5ea5ed95de9792c1fb3324

mount: reword directory empty warning a bit
---

diff --git a/src/core/automount.c b/src/core/automount.c
index 11b6a6a45..b1619a64e 100644
--- a/src/core/automount.c
+++ b/src/core/automount.c
@@ -502,7 +502,7 @@ static void automount_enter_waiting(Automount *a) {
         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);
+                log_notice("%s: Directory %s to mount over is not empty, mounting anyway. (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;
diff --git a/src/core/mount.c b/src/core/mount.c
index 66ef0cd25..7e3ccc11b 100644
--- a/src/core/mount.c
+++ b/src/core/mount.c
@@ -960,7 +960,7 @@ static void mount_enter_mounting(Mount *m) {
         mkdir_p_label(m->where, m->directory_mode);
 
         if (dir_is_empty(m->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.)", m->meta.id, m->where);
+                log_notice("%s: Directory %s to mount over is not empty, mounting anyway. (To see the over-mounted files, please manually mount the underlying file system to a secondary location.)", m->meta.id, m->where);
 
         /* Create the source directory for bind-mounts if needed */
         p = get_mount_parameters_fragment(m);