[patch] fixes is_net_fs to report the type $1 was mounted and not how it was mounted

is-net-fs.patch (text/plain), 1.16 KB, created by Roy Marples (RETIRED) on 2005-05-27 07:57:09 UTC

Index: sbin/functions.sh
===================================================================
RCS file: /var/cvsroot/gentoo-src/rc-scripts/sbin/functions.sh,v
retrieving revision 1.81.2.7
diff -u -B -r1.81.2.7 functions.sh
--- sbin/functions.sh	26 May 2005 00:37:40 -0000	1.81.2.7
+++ sbin/functions.sh	27 May 2005 14:53:49 -0000
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-src/rc-scripts/sbin/functions.sh,v 1.81.2.7 2005/05/26 00:37:40 vapier Exp $
+# $Header: /var/cvsroot/gentoo-src/rc-scripts/sbin/functions.sh,v 1.81.2.8 2005/05/27 10:29:14 uberlord Exp $
 
 RC_GOT_FUNCTIONS="yes"
 
@@ -606,7 +606,13 @@
 #   EXAMPLE:  if is_net_fs / ; then ...
 #
 is_net_fs() {
-	local fstype=$(mount -o remount -fv "$1" | awk '{print $(NF-1)}')
+	local fstype
+	# /proc/mounts is always accurate but may not always be available
+	if [[ -e /proc/mounts ]]; then
+		fstype=$( sed -n -e '/^rootfs/!s:.* '"$1"' \([^ ]*\).*:\1:p' /proc/mounts )
+	else
+		fstype=$( mount | sed -n -e 's:.* on '"$1"' type \([^ ]*\).*:\1:p' )
+	fi
 	[[ " ${NET_FS_LIST} " == *" ${fstype} "* ]]
 	return $?
 }