diff options
| author | John Bowler <jbowler@nslu2-linux.org> | 2006-02-06 08:30:48 +0000 |
|---|---|---|
| committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2006-02-06 08:30:48 +0000 |
| commit | d2449f188c1d5b589a2e26dd044d3c717e36cb42 (patch) | |
| tree | aeadae4152b1b4177e35ff7df0f6c03797629082 /packages | |
| parent | df9021a741b54e4504ba2e639b582b808994a2b4 (diff) | |
| parent | 4228b12fbf49084eeaabec66c4785a0a091015f6 (diff) | |
merge of ad980e031ab94ad3b8f2d1e29f2bbae35f47d710
and ae1272cefbd4147e462e255072a2484f4f9a7a1b
Diffstat (limited to 'packages')
| -rw-r--r-- | packages/initscripts/initscripts-1.0/slugos/checkroot.sh | 16 | ||||
| -rw-r--r-- | packages/initscripts/initscripts-slugos_1.0.bb | 2 |
2 files changed, 5 insertions, 13 deletions
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)}" |