[Pkg-sysvinit-commits] r539 - in sysvinit/trunk/debian: .
initscripts/etc/init.d
Thomas Hood
jdthood-guest at costa.debian.org
Fri Jan 6 11:29:51 UTC 2006
Author: jdthood-guest
Date: 2006-01-06 11:29:50 +0000 (Fri, 06 Jan 2006)
New Revision: 539
Modified:
sysvinit/trunk/debian/changelog
sysvinit/trunk/debian/initscripts/etc/init.d/checkfs.sh
sysvinit/trunk/debian/initscripts/etc/init.d/checkroot.sh
Log:
Pause 5 seconds on sulogin failure
Modified: sysvinit/trunk/debian/changelog
===================================================================
--- sysvinit/trunk/debian/changelog 2006-01-06 10:54:43 UTC (rev 538)
+++ sysvinit/trunk/debian/changelog 2006-01-06 11:29:50 UTC (rev 539)
@@ -13,7 +13,9 @@
(Closes: #345370)
* init: 65_init_u_in_06.dpatch: Allow 'telinit u' in runlevels 0, 6
(Closes: #345719)
- * Remount ro with -f on GNU/kFreeBSD (Closes: #344547)
+ * umountroot: Remount ro with -f on GNU/kFreeBSD (Closes: #344547)
+ * checkroot.sh, checkfs.sh: Pause for five seconds if sulogin fails
+ (Partially addresses: #337444)
* Include /var/log/fsck/ in initscripts package (Closes: #346139)
* Replace /lib/init/functions.sh with /lib/init/mount-functions.sh
for use by mountvirtfs and mountdevsubfs
Modified: sysvinit/trunk/debian/initscripts/etc/init.d/checkfs.sh
===================================================================
--- sysvinit/trunk/debian/initscripts/etc/init.d/checkfs.sh 2006-01-06 10:54:43 UTC (rev 538)
+++ sysvinit/trunk/debian/initscripts/etc/init.d/checkfs.sh 2006-01-06 11:29:50 UTC (rev 539)
@@ -63,7 +63,12 @@
log_warning_msg "A maintenance shell will now be started.
CONTROL-D will terminate this shell and resume system boot."
# Start a single user shell on the console
- sulogin $CONSOLE
+ if ! sulogin $CONSOLE
+ then
+ log_failure_msg "Attempt to start maintenance shell failed.
+Continuing with system boot in 5 seconds."
+ sleep 5
+ fi
}
if [ "$VERBOSE" != no ]
then
@@ -79,7 +84,8 @@
then
handle_failed_fsck
else
- log_success_msg "Done checking file systems. Log saved in ${FSCK_LOGFILE}."
+ log_success_msg "Done checking file systems.
+A log is being saved in ${FSCK_LOGFILE} if that location is writable."
fi
else
log_action_begin_msg "Checking file systems"
Modified: sysvinit/trunk/debian/initscripts/etc/init.d/checkroot.sh
===================================================================
--- sysvinit/trunk/debian/initscripts/etc/init.d/checkroot.sh 2006-01-06 10:54:43 UTC (rev 538)
+++ sysvinit/trunk/debian/initscripts/etc/init.d/checkroot.sh 2006-01-06 11:29:50 UTC (rev 539)
@@ -186,8 +186,12 @@
log_warning_msg "A maintenance shell will now be started.
CONTROL-D will terminate this shell and reboot the system."
# Start a single user shell on the console
- sulogin $CONSOLE
- log_action_msg "Will now reboot"
+ if ! sulogin $CONSOLE
+ then
+ log_failure_msg "Attempt to start maintenance shell failed. Will reboot in 5 seconds."
+ sleep 5
+ fi
+ log_action_msg "Will now request reboot"
reboot -f
fi
@@ -314,8 +318,12 @@
After performing system maintenance, press CONTROL-D to terminate
the maintenance shell and reboot the system."
# Start a single user shell on the console
- sulogin $CONSOLE
- log_action_msg "Will now reboot"
+ if ! sulogin $CONSOLE
+ then
+ log_failure_msg "Attempt to start maintenance shell failed. Will reboot in 5 seconds."
+ sleep 5
+ fi
+ log_action_msg "Will now request reboot"
reboot -f
elif [ "$FSCKCODE" -gt 1 ]
then
@@ -323,7 +331,7 @@
but requested that the system be rebooted."
log_warning_msg "The system will be rebooted in 5 seconds."
sleep 5
- log_action_msg "Will now reboot"
+ log_action_msg "Will now request reboot"
reboot -f
fi
More information about the Pkg-sysvinit-commits
mailing list