diff options
| author | Rod Whitby <rod@whitby.id.au> | 2006-02-08 11:54:37 +0000 |
|---|---|---|
| committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2006-02-08 11:54:37 +0000 |
| commit | 8d28ecc02a19278b07d847120f613c9f6fe1f850 (patch) | |
| tree | 83cc790d76150c03f0bafcba497239b570be12ea /packages/initscripts | |
| parent | 4944b24faa03ad5bed435b4a56022cb5b95279b3 (diff) | |
| parent | e0d409e4eb2652bfc46272ffc5b6281731dd367e (diff) | |
merge of 56993761cfcc246959dccb5e35fa402c5c3c9738
and 93e5bd9df4fa3927a9dfb67420d1a48ab721c007
Diffstat (limited to 'packages/initscripts')
| -rw-r--r-- | packages/initscripts/initscripts-1.0/slugos/checkroot.sh | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/packages/initscripts/initscripts-1.0/slugos/checkroot.sh b/packages/initscripts/initscripts-1.0/slugos/checkroot.sh index be640fd254..3943f13427 100644 --- a/packages/initscripts/initscripts-1.0/slugos/checkroot.sh +++ b/packages/initscripts/initscripts-1.0/slugos/checkroot.sh @@ -134,10 +134,18 @@ else # Start a single user shell on the console if single_user_ok then - sulogin -t 300 $CONSOLE - # assume the system is ok now... + 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 - echo "... continuing boot" fi else echo "*** ERROR! Cannot fsck root fs because it is not mounted read-only!" |