[patch] rc-devpts-check-if-mounted-simplified.patch

rc-devpts-check-if-mounted-simplified.patch (text/plain), 935 bytes, created by Amadeusz Żołnowski (RETIRED) on 2010-09-22 17:49:06 UTC

Index: branches/baselayout-1_12/sbin/rc
===================================================================
--- branches/baselayout-1_12/sbin/rc	(revision 3174)
+++ branches/baselayout-1_12/sbin/rc	(working copy)
@@ -387,14 +387,18 @@
 			fi
 
 			if [[ -d /dev/pts ]] ; then
-				ebegin "Mounting devpts at /dev/pts"
-				if [[ ${RC_USE_FSTAB} = "yes" ]] ; then
-					mntcmd=$(get_mount_fstab /dev/pts)
+				if ! is_mounted /dev/pts; then
+					ebegin "Mounting devpts at /dev/pts"
+					if [[ ${RC_USE_FSTAB} = "yes" ]] ; then
+						mntcmd=$(get_mount_fstab /dev/pts)
+					else
+						unset mntcmd
+					fi
+					try mount -n ${mntcmd:--t devpts devpts /dev/pts -o gid=5,mode=0620,noexec,nosuid}
+					eend $?
 				else
-					unset mntcmd
+					einfo "Skipping mount of /dev/pts as it's already mounted"
 				fi
-				try mount -n ${mntcmd:--t devpts devpts /dev/pts -o gid=5,mode=0620,noexec,nosuid}
-				eend $?
 			fi
 		fi
 	fi