From bbd810425b819318fda48f390fec818c20bbff39 Mon Sep 17 00:00:00 2001
From: Roy Marples <roy@marples.name>
Date: Sun, 19 Apr 2009 11:15:37 +0000
Subject: Move special umount of tmpfs to the swap init script where it
 belongs, #149.

---
 init.d/localmount.in | 6 ------
 init.d/swap.in       | 6 ++++++
 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;;
-- 
cgit v1.2.3