From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Thu, 25 Nov 2010 13:15:25 +0000 (+0100)
Subject: checkfstab: Fix "root=" parsing.
X-Git-Tag: v2.9-beta1~48^2~5^2~2^2~2
X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=commitdiff_plain;h=9e1ceb99a17a1da7bb0b07660504a19350208d0b

checkfstab: Fix "root=" parsing.
---

diff --git a/src/initscripts/init.d/checkfstab b/src/initscripts/init.d/checkfstab
index 691050ef03..ea845458f8 100644
--- a/src/initscripts/init.d/checkfstab
+++ b/src/initscripts/init.d/checkfstab
@@ -18,12 +18,13 @@
 case "${1}" in
 	start)
 		#Skip if root is set by UUID
-		if (grep "root=UUID=" /proc/cmdline); then
+		if (grep "root=UUID=" /proc/cmdline > /dev/null); then
 			exit 0;
 		fi
 		boot_mesg "Checking fstab bootdevice ..."
 		read CMDLINE < /proc/cmdline
-		ROOTPOS=`expr index "$CMDLINE" root=`
+		ROOTPOS=${CMDLINE%%root=*}
+		ROOTPOS=${#ROOTPOS}
 		NEWROOT=`echo ${CMDLINE:$ROOTPOS} | cut -d"=" -f2 | cut -d" " -f1`;
 		OLDBOOT=`cat /etc/fstab | grep -m1 "	/	" | cut -d" " -f1 | cut -f1`;
 		OLDDRV=${OLDBOOT::`expr length $OLDBOOT`-1}