From a56f5680381313b9a12a3ba133c5cb7a2154aa67 Mon Sep 17 00:00:00 2001 From: John Bowler Date: Mon, 6 Feb 2006 02:42:55 +0000 Subject: initscripts-slugos: further fixes to checkroot.sh in 1.0 slugos-init: make beep silent, extend single_user_ok function in 0.10 --- packages/initscripts/initscripts-1.0/slugos/checkroot.sh | 12 ++++++++++-- packages/initscripts/initscripts-slugos_1.0.bb | 2 +- 2 files changed, 11 insertions(+), 3 deletions(-) (limited to 'packages/initscripts') 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)}" -- cgit v1.2.3