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 c70855e..be640fd 100644 (file)
--- 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 df89fd1..7a4f79c 100644 (file)
--- 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)}"