From dc0ba7ebf3109b2bbdd73c5f0a411ba6129c2daf Mon Sep 17 00:00:00 2001
From: Roy Marples <roy@marples.name>
Date: Tue, 9 Oct 2007 15:33:05 +0000
Subject: netmount, localmount, halt.sh and net scripts now check OS specific
 flags to see if a mount is network mounted (linux = fstab, *bsd = "local" in
 mount options) or not, #192772.

---
 init.d/localmount | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'init.d/localmount')

diff --git a/init.d/localmount b/init.d/localmount
index 4b820267..001338c3 100755
--- a/init.d/localmount
+++ b/init.d/localmount
@@ -203,7 +203,8 @@ stop() {
 	# Umount loopback devices
 	einfo "Unmounting loopback devices"
 	eindent
-	do_unmount "umount -d" "${no_umounts}" "^/dev/loop"
+	do_unmount "umount -d" --skip-point-regex "${no_umounts}" \
+		--node-regex "^/dev/loop"
 	eoutdent
 
 	# Now everything else, except network filesystems as the
@@ -215,7 +216,8 @@ stop() {
 		fs="${fs}${fs:+|}${x}"
 	done
 	[ -n "${fs}" ] && fs="^(${fs})$"
-	do_unmount "umount" "${no_umounts}" "" "" "${fs}"
+	do_unmount "umount" --skip-point-regex "${no_umounts}" \
+		${fs:+--skip-fstype-regex} ${fs} --nonetdev
 	eoutdent
 
 	return 0
-- 
cgit v1.2.3