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.

sh/rc-functions.sh

@@ -26,6 +26,11 @@ stop_addon() {
 is_net_fs() {
 	[ -z "$1" ] && return 1
 
+	# Check OS specific flags to see if we're local or net mounted
+	mountinfo --quiet --netdev "$1"  && return 0
+	mountinfo --quiet --nonetdev "$1" && return 1
+
+	# Fall back on fs types
 	local t=$(mountinfo --fstype "$1")
 	for x in ${RC_NET_FS_LIST}; do
 		[ "${x}" = "${t}" ] && return 0

sh/rc-mount.sh

@@ -12,8 +12,8 @@ do_unmount() {
 		f_kill="-"
 	fi
 
-	mountinfo ${2:+--skip-point-regex} $2 ${3:+--node-regex} $3 ${4:+--fstype-regex} $4 ${5:+--skip-fstype-regex} $5 | \
-	while read mnt; do
+	shift
+	mountinfo "$@" | while read mnt; do
 		case "${cmd}" in
 			umount*)
 				# If we're using the mount (probably /usr) then don't unmount us