diff options
| author | John Bowler <jbowler@nslu2-linux.org> | 2006-02-06 02:48:51 +0000 |
|---|---|---|
| committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2006-02-06 02:48:51 +0000 |
| commit | df9021a741b54e4504ba2e639b582b808994a2b4 (patch) | |
| tree | 456ac557f011f11d84e71aba6ec8e6f0899d3dd0 /packages/initscripts | |
| parent | 951a6530af92b32af59d8c5e637a0462e6698b86 (diff) | |
| parent | 28ae043187520daaa291ce8fc068dae9aee40334 (diff) | |
merge of ffcf1e664e4c623df8d1843978006676812e0bca
and e1959e48d26e0499e408ad374dceffa4f1055500
Diffstat (limited to 'packages/initscripts')
| -rw-r--r-- | packages/initscripts/initscripts-1.0/slugos/checkroot.sh | 12 | ||||
| -rw-r--r-- | packages/initscripts/initscripts-slugos_1.0.bb | 2 |
2 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 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 diff --git a/packages/initscripts/initscripts-slugos_1.0.bb b/packages/initscripts/initscripts-slugos_1.0.bb index 3219f8883f..df89fd161b 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}.7" +PR := "${PR}.8" FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/${P}', '${FILE_DIRNAME}/initscripts-${PV}', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}" |