summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2012-09-19 09:55:56 +0200
committerLennart Poettering <lennart@poettering.net>2012-09-19 09:58:34 +0200
commita99124d92f8a60215f5ea5ed95de9792c1fb3324 (patch)
treef5b9c550c1f67d4a838f4e6cdbd4eaab23da38a7
parent49111a708eb3bc8488c56c4695fa36c826bf3657 (diff)
mount: reword directory empty warning a bit
-rw-r--r--src/core/automount.c2
-rw-r--r--src/core/mount.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/core/automount.c b/src/core/automount.c
index 11b6a6a45a..b1619a64e6 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 66ef0cd25c..7e3ccc11b6 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);