[Pkg-sysvinit-commits] r628 - sysvinit/trunk/debian/initscripts/etc/init.d

[Thomas Hood]

Author: jdthood-guest
Date: 2006-01-12 12:46:41 +0000 (Thu, 12 Jan 2006)
New Revision: 628

Modified:
   sysvinit/trunk/debian/initscripts/etc/init.d/checkroot.sh
   sysvinit/trunk/debian/initscripts/etc/init.d/reboot
   sysvinit/trunk/debian/initscripts/etc/init.d/urandom
Log:
s/reboot/restart/ in messages for consistency with what reboot itself prints

Modified: sysvinit/trunk/debian/initscripts/etc/init.d/checkroot.sh
===================================================================
--- sysvinit/trunk/debian/initscripts/etc/init.d/checkroot.sh	2006-01-12 11:13:50 UTC (rev 627)
+++ sysvinit/trunk/debian/initscripts/etc/init.d/checkroot.sh	2006-01-12 12:46:41 UTC (rev 628)
@@ -179,19 +179,20 @@
 	#
 	if [ "$rootfatal" = yes ]
 	then
-		log_failure_msg "The device node $rootdev for the root filesystem is missing or incorrect
-or there is no entry for the root filesystem listed in /etc/fstab.
-The system is also unable to create a temporary node in /dev/shm.
+		log_failure_msg "The device node $rootdev for the root filesystem is missing or incorrect 
+or there is no entry for the root filesystem listed in /etc/fstab. 
+The system is also unable to create a temporary node in /dev/shm. 
 This means you have to fix the problem manually."
-		log_warning_msg "A maintenance shell will now be started.
-CONTROL-D will terminate this shell and reboot the system."
+		log_warning_msg "A maintenance shell will now be started. 
+CONTROL-D will terminate this shell and restart the system."
 		# Start a single user shell on the console
 		if ! sulogin $CONSOLE
 		then
-			log_failure_msg "Attempt to start maintenance shell failed. Will reboot in 5 seconds."
+			log_failure_msg "Attempt to start maintenance shell failed. 
+Will restart in 5 seconds."
 			sleep 5
 		fi
-		[ "$VERBOSE" = no ] || log_action_msg "Will now request reboot"
+		[ "$VERBOSE" = no ] || log_action_msg "Will now restart"
 		reboot -f
 	fi
 
@@ -291,7 +292,7 @@
 			then
 				log_success_msg "Done checking root file system. Log saved in ${FSCK_LOGFILE}."
 			else
-				log_failure_msg "Root file system check failed with error code ${FSCKCODE}.
+				log_failure_msg "Root file system check failed with error code ${FSCKCODE}. 
 A log is being saved in ${FSCK_LOGFILE} if that location is writable."
 			fi
 		fi
@@ -309,29 +310,30 @@
 	then
 		# Surprise! Re-directing from a HERE document (as in "cat << EOF")
 		# does not work because the root is currently read-only.
-		log_failure_msg "An automatic file system check (fsck) of the root filesystem failed.
-A manual fsck must be performed, then the system must be rebooted.
-The fsck should be performed in maintenance mode with the root
-filesystem mounted in read-only mode."
-		log_warning_msg "The root filesystem is currently mounted in read-only mode.
-A maintenance shell will now be started.
-After performing system maintenance, press CONTROL-D to terminate 
-the maintenance shell and reboot the system."
+		log_failure_msg "An automatic file system check (fsck) of the root filesystem failed. 
+A manual fsck must be performed, then the system restarted. 
+The fsck should be performed in maintenance mode with the 
+root filesystem mounted in read-only mode."
+		log_warning_msg "The root filesystem is currently mounted in read-only mode. 
+A maintenance shell will now be started. 
+After performing system maintenance, press CONTROL-D to
+terminate the maintenance shell and restart the system."
 		# Start a single user shell on the console
 		if ! sulogin $CONSOLE
 		then
-			log_failure_msg "Attempt to start maintenance shell failed. Will reboot in 5 seconds."
+			log_failure_msg "Attempt to start maintenance shell failed. 
+Will restart in 5 seconds."
 			sleep 5
 		fi
-		[ "$VERBOSE" = no ] || log_action_msg "Will now request reboot"
+		[ "$VERBOSE" = no ] || log_action_msg "Will now restart"
 		reboot -f
 	elif [ "$FSCKCODE" -gt 1 ]
 	then
-		log_failure_msg "The file system check corrected errors on the root partition
-but requested that the system be rebooted."
-		log_warning_msg "The system will be rebooted in 5 seconds."
+		log_failure_msg "The file system check corrected errors on the root partition 
+but requested that the system be restarted."
+		log_warning_msg "The system will be restarted in 5 seconds."
 		sleep 5
-		[ "$VERBOSE" = no ] || log_action_msg "Will now request reboot"
+		[ "$VERBOSE" = no ] || log_action_msg "Will now restart"
 		reboot -f
 	fi
 

Modified: sysvinit/trunk/debian/initscripts/etc/init.d/reboot
===================================================================
--- sysvinit/trunk/debian/initscripts/etc/init.d/reboot	2006-01-12 11:13:50 UTC (rev 627)
+++ sysvinit/trunk/debian/initscripts/etc/init.d/reboot	2006-01-12 12:46:41 UTC (rev 628)
@@ -17,7 +17,7 @@
 do_stop () {
 	# Message should end with a newline since kFreeBSD may
 	# print more stuff (see #323749)
-	log_action_msg "Will now reboot"
+	log_action_msg "Will now restart"
 	reboot -d -f -i
 }
 

Modified: sysvinit/trunk/debian/initscripts/etc/init.d/urandom
===================================================================
--- sysvinit/trunk/debian/initscripts/etc/init.d/urandom	2006-01-12 11:13:50 UTC (rev 627)
+++ sysvinit/trunk/debian/initscripts/etc/init.d/urandom	2006-01-12 12:46:41 UTC (rev 628)
@@ -5,8 +5,8 @@
 # Required-Stop:     $local_fs
 # Default-Start:     S
 # Default-Stop:      0 6
-# Short-Description: Save and restore random seed between reboots.
-# Description        This script saves the random seed between reboots.
+# Short-Description: Save and restore random seed between restarts.
+# Description        This script saves the random seed between restarts.
 #                    It is called from the boot, halt and reboot scripts.
 ### END INIT INFO