[patch] Replace the regex with simple test logic

x (text/plain), 1.62 KB, created by Roy Marples (RETIRED) on 2006-12-06 15:43:40 UTC

Index: init.d/checkroot
===================================================================
--- init.d/checkroot	(revision 2393)
+++ init.d/checkroot	(working copy)
@@ -70,19 +70,22 @@
 		# - find the / entry
 		# - make sure we have 6 fields
 		# - see if fs_passno is something other than 0
-		if [[ $'\n'$(</etc/fstab) =~ $'\n'.*[[:space:]]/[[:space:]].*[[:space:]].*[[:space:]](.*)[[:space:]] ]] \
-		&& [[ ${BASH_REMATCH[1]} == "0" ]] ; then
-			ebegin $"Checking root filesystem"
-			if [[ $(uname) == "Linux" ]] ; then
-				fsck -C -T -a /
+		local node= point= fs= opts= dump= pass= foo=
+		while read node point fs opts dump pass foo ; do
+			[[ ${node} == "#"* || ${point} != "/" || -z ${fs} ]] && continue
+			if [[ ${pass:-0} == "0" ]] ; then
+				ebegin $"Skipping root filesystem check" "(fstab's passno == 0)"
+				retval=0
 			else
-				fsck -p -F /
+				ebegin $"Checking root filesystem"
+				if [[ $(uname) == "Linux" ]] ; then
+					fsck -C -T -a /
+				else
+					fsck -p -F /
+				fi
+				retval=$?
 			fi
-			retval=$?
-		else
-			ebegin $"Skipping root filesystem check" "(fstab's passno == 0)"
-			retval=0
-		fi
+		done < /etc/fstab
 	fi
 
 	if [[ ${retval} -eq 0 ]] ; then
Index: ChangeLog
===================================================================
--- ChangeLog	(revision 2395)
+++ ChangeLog	(working copy)
@@ -3,6 +3,9 @@
 
   06 Dec 2006; Roy Marples <[e-mail]>:
 
+    Replace checkroot bash regex with a while read and parse each option
+    as the regex was complex and error prone, #157115.
+
     Report /etc/init.d/$SVCNAME in syslog instead of rcscripts,
     #156138 thanks to Wolfram Schlich.