[patch] Check if /sys is mounted

x (text/plain), 1.08 KB, created by Roy Marples (RETIRED) on 2007-09-18 15:52:24 UTC

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 2889)
+++ ChangeLog	(working copy)
@@ -3,6 +3,8 @@
 
   18 Sep 2007; Roy Marples <[e-mail]>:
 
+    Only mount /sys if it's not mounted, #192436.
+
     API changes!
 
     rc_ls_dir, rc_get_config and rc_get_list no longer take a starting list
Index: sh.Linux/init.sh
===================================================================
--- sh.Linux/init.sh	(revision 2889)
+++ sh.Linux/init.sh	(working copy)
@@ -140,10 +140,12 @@
 
 if [ "${RC_UNAME}" != "GNU/kFreeBSD" -a "${RC_SYS}" != "VPS" -a "${K26}" = "0" ] ; then
 	if [ -d /sys ] ; then
-		ebegin "Mounting sysfs at /sys"
-		mntcmd="$(fstabinfo --mountcmd /sys)"
-		try mount -n ${mntcmd:--t sysfs -o noexec,nosuid,nodev sysfs /sys}
-		eend $?
+		if ! mountinfo --quiet /sys ; then
+			ebegin "Mounting sysfs at /sys"
+			mntcmd="$(fstabinfo --mountcmd /sys)"
+			try mount -n ${mntcmd:--t sysfs -o noexec,nosuid,nodev sysfs /sys}
+			eend $?
+		fi
 	else
 		ewarn "No /sys to mount sysfs needed in 2.6 and later kernels!"
 	fi