summaryrefslogtreecommitdiff
path: root/packages/initscripts/initscripts-1.0/slugos
diff options
context:
space:
mode:
authorJohn Bowler <jbowler@nslu2-linux.org>2006-02-06 02:42:55 +0000
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>2006-02-06 02:42:55 +0000
commita56f5680381313b9a12a3ba133c5cb7a2154aa67 (patch)
treede6d252a90a1ff8db12b6e9e22aba986f81aa40a /packages/initscripts/initscripts-1.0/slugos
parent54a44b070e7516a04ecaf6d1ed8c05c836a70e1b (diff)
initscripts-slugos: further fixes to checkroot.sh in 1.0
slugos-init: make beep silent, extend single_user_ok function in 0.10
Diffstat (limited to 'packages/initscripts/initscripts-1.0/slugos')
-rw-r--r--packages/initscripts/initscripts-1.0/slugos/checkroot.sh12
1 files changed, 10 insertions, 2 deletions
diff --git a/packages/initscripts/initscripts-1.0/slugos/checkroot.sh b/packages/initscripts/initscripts-1.0/slugos/checkroot.sh
index a26b9ffa37..c70855ee43 100644
--- a/packages/initscripts/initscripts-1.0/slugos/checkroot.sh
+++ b/packages/initscripts/initscripts-1.0/slugos/checkroot.sh
@@ -4,6 +4,7 @@
# Version: @(#)checkroot.sh 2.84 25-Jan-2002 miquels@cistron.nl
#
+. /etc/default/functions
. /etc/default/rcS
#
@@ -133,8 +134,15 @@ else
# Start a single user shell on the console
if single_user_ok
then
- sulogin $CONSOLE
- reboot -f
+ 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"
fi