diff options
author | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2012-12-05 11:59:05 +0100 |
---|---|---|
committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2012-12-05 12:25:50 +0100 |
commit | 20ad4cfd8e5592f634f20468798cbc1055ab9faf (patch) | |
tree | 19d3421163da514fad9c74b034d5014636a1cfe0 /src/core/automount.c | |
parent | f3ffced5415a385ff08b460fcc95251e773b38a7 (diff) |
core: add catalog entry and MESSAGE_ID for overmounting
Diffstat (limited to 'src/core/automount.c')
-rw-r--r-- | src/core/automount.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/core/automount.c b/src/core/automount.c index 5bf59df8bc..74776646f6 100644 --- a/src/core/automount.c +++ b/src/core/automount.c @@ -31,6 +31,7 @@ #include "unit.h" #include "automount.h" +#include "mount.h" #include "load-fragment.h" #include "load-dropin.h" #include "unit-name.h" @@ -507,8 +508,7 @@ 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, mounting anyway. (To see the over-mounted files, please manually mount the underlying file system to a secondary location.)", a->meta.id, a->where); + warn_if_dir_nonempty(a->meta.id, a->where); if (pipe2(p, O_NONBLOCK|O_CLOEXEC) < 0) { r = -errno; |