aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--init.d/localmount.in6
-rw-r--r--init.d/swap.in6
2 files changed, 6 insertions, 6 deletions
diff --git a/init.d/localmount.in b/init.d/localmount.in
index 07a95e88..2cdc0c57 100644
--- a/init.d/localmount.in
+++ b/init.d/localmount.in
@@ -52,12 +52,6 @@ stop()
# Flush all pending disk writes now
sync; sync
- # Try to unmount all tmpfs filesystems not in use, else a deadlock may
- # occure, bug #13599.
- # As $RC_SVCDIR may also be tmpfs we cd to it to lock it
- cd "${RC_SVCDIR}"
- umount -a -t tmpfs 2>/dev/null
-
. "${RC_LIBDIR}"/sh/rc-mount.sh
# Umount loopback devices
diff --git a/init.d/swap.in b/init.d/swap.in
index 6b2f7057..bad2b13b 100644
--- a/init.d/swap.in
+++ b/init.d/swap.in
@@ -21,6 +21,12 @@ start()
stop()
{
ebegin "Deactivating swap devices"
+
+ # Try to unmount all tmpfs filesystems not in use, else a deadlock may
+ # occure. As $RC_SVCDIR may also be tmpfs we cd to it to lock it
+ cd "${RC_SVCDIR}"
+ umount -a -t tmpfs 2>/dev/null
+
case "${RC_UNAME}" in
NetBSD|OpenBSD) swapctl -U -t noblk >/dev/null;;
*) swapoff -a >/dev/null;;