picnoir
/
Systemd
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

mount: notify the user if we over-mount a non-empty directory 

https://bugzilla.redhat.com/show_bug.cgi?id=858266
This commit is contained in:
Lennart Poettering 2012-09-18 18:40:31 +02:00
parent 2b4957a99e
commit 257f1d8ec4
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/core/mount.c
View File

@ -959,6 +959,9 @@ 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);
/* Create the source directory for bind-mounts if needed */
p = get_mount_parameters_fragment(m);
if (p && mount_is_bind(p))
@ -981,7 +984,8 @@ static void mount_enter_mounting(Mount *m) {
mount_unwatch_control_pid(m);
if ((r = mount_spawn(m, m->control_command, &m->control_pid)) < 0)
r = mount_spawn(m, m->control_command, &m->control_pid);
if (r < 0)
goto fail;
mount_set_state(m, MOUNT_MOUNTING);