forked from pool/systemd
b8b836245b
- Add systemctl-options.patch: handle SYSTEMCTL_OPTIONS internaly (bnc#798620). - Update crypt-loop-file.patch to correctly detect crypto loop files (bnc#799514). - Add journalctl-remove-leftover-message.patch: remove debug message in systemctl. - Add job-avoid-recursion-when-cancelling.patch: prevent potential recursion when cancelling a service. - Add sysctl-parse-all-keys.patch: ensure sysctl file is fully parsed. - Add journal-fix-cutoff-max-date.patch: fix computation of cutoff max date for journal. - Add reword-rescue-mode-hints.patch: reword rescue prompt. - Add improve-overflow-checks.patch: improve time overflow checks. - Add fix-swap-behaviour-with-symlinks.patch: fix swap behaviour with symlinks. - Add hostnamectl-fix-set-hostname-with-no-argument.patch: ensure hostnamectl requires an argument when called with set-hostname option. - Add agetty-overrides-term.patch: pass correctly terminal type to agetty. - Add check-for-empty-strings-in-strto-conversions.patch: better check for empty strings in strto* conversions. - Add strv-cleanup-error-path-loops.patch: cleanup strv on error path. - Add cryptsetup-handle-plain.patch: correctly handle "plain" option in cryptsetup. - Add fstab-generator-improve-error-message.patch: improve error message in fstab-generator. - Add delta-accept-t-option.patch: accept -t option in OBS-URL: https://build.opensuse.org/request/show/149703 OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=331
36 lines
1.4 KiB
Diff
36 lines
1.4 KiB
Diff
From 0c08f5cde749bd2818475e487109cd0d413452df Mon Sep 17 00:00:00 2001
|
|
From: Lennart Poettering <lennart@poettering.net>
|
|
Date: Wed, 16 Jan 2013 03:51:56 +0100
|
|
Subject: [PATCH] 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.
|
|
---
|
|
src/core/umount.c | 6 ++++--
|
|
1 file changed, 4 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/src/core/umount.c b/src/core/umount.c
|
|
index 96232d3..c7b6cee 100644
|
|
--- a/src/core/umount.c
|
|
+++ b/src/core/umount.c
|
|
@@ -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;
|
|
|
|
--
|
|
1.7.10.4
|
|
|