From: John Bowler <jbowler@nslu2-linux.org>
Date: Mon, 6 Feb 2006 06:25:25 +0000 (+0000)
Subject: initscripts-slugos: make checkroot.sh work with any sulogin in 1.0
X-Git-Tag: Release-2010-05/1~9453^2~2424^2~6
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f9fd6571b2567f132672b118d2826c1a83955c02;p=openembedded.git

initscripts-slugos: make checkroot.sh work with any sulogin in 1.0
---

diff --git a/packages/initscripts/initscripts-1.0/slugos/checkroot.sh b/packages/initscripts/initscripts-1.0/slugos/checkroot.sh
index c70855ee43..be640fd254 100644
--- a/packages/initscripts/initscripts-1.0/slugos/checkroot.sh
+++ b/packages/initscripts/initscripts-1.0/slugos/checkroot.sh
@@ -130,22 +130,14 @@ else
       echo "CONTROL-D will exit from this shell and REBOOT the system."
       echo
       leds system panic
-      beep -r 5
+      leds beep -r 5
       # Start a single user shell on the console
       if single_user_ok
       then
-	sulogin -t 600 $CONSOLE
-	# if this exits with SIGALRM (which happens to be 142) the
-	# timeout happened, do not, then, reboot!
-	if test $? -ne 142
-	then
-	  reboot -f
-	else
-	  echo "/etc/init.d/checkroot.sh: sulogin timeout, continuing boot"
-	fi
-      else
-	echo "/etc/init.d/checkroot.sh: fsck failed, continuing boot"
+	sulogin -t 300 $CONSOLE
+	# assume the system is ok now...
       fi
+      echo "... continuing boot"
     fi
   else
     echo "*** ERROR!  Cannot fsck root fs because it is not mounted read-only!"
diff --git a/packages/initscripts/initscripts-slugos_1.0.bb b/packages/initscripts/initscripts-slugos_1.0.bb
index df89fd161b..7a4f79c20b 100644
--- a/packages/initscripts/initscripts-slugos_1.0.bb
+++ b/packages/initscripts/initscripts-slugos_1.0.bb
@@ -11,7 +11,7 @@ RCONFLICTS = "initscripts"
 # All other standard definitions inherited from initscripts
 # Except the PR which is hacked here.  The format used is
 # a suffix
-PR := "${PR}.8"
+PR := "${PR}.9"
 
 FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/${P}', '${FILE_DIRNAME}/initscripts-${PV}', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}"