1
0
mirror of https://github.com/systemd/systemd.git synced 2025-03-14 04:58:28 +03:00

shutdown: in the final umount loop don't use MNT_FORCE

MNT_FORCE is honoured by NFS and FUSE and allows unmounting of the FS
even if consumers still use it. For our brute-force loop we rely on
EBUSY being reported as long as a file system is still used by a
loopback device or suchlike. Hence, drop MNT_FORCE to make EBUSY
reliable.
This commit is contained in:
Lennart Poettering 2013-01-16 03:51:56 +01:00
parent ec76596cab
commit 0c08f5cde7

View File

@ -442,9 +442,11 @@ static int mount_points_list_umount(MountPoint **head, bool *changed, bool log_e
)
continue;
/* Trying to umount. Forcing to umount if busy (only for NFS mounts) */
/* Trying to umount. We don't force here since we rely
* on busy NFS and FUSE file systems to return EBUSY
* until we closed everything on top of them. */
log_info("Unmounting %s.", m->path);
if (umount2(m->path, MNT_FORCE) == 0) {
if (umount2(m->path, 0) == 0) {
if (changed)
*changed = true;