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

[Thomas Hood]

Author: jdthood-guest
Date: 2005-11-18 15:36:46 +0000 (Fri, 18 Nov 2005)
New Revision: 146

Modified:
   sysvinit/trunk/debian/initscripts/etc/init.d/checkfs.sh
   sysvinit/trunk/debian/initscripts/etc/init.d/checkroot.sh
   sysvinit/trunk/debian/initscripts/etc/init.d/mountall.sh
Log:
Tweak messages

Modified: sysvinit/trunk/debian/initscripts/etc/init.d/checkfs.sh
===================================================================
--- sysvinit/trunk/debian/initscripts/etc/init.d/checkfs.sh	2005-11-18 15:14:20 UTC (rev 145)
+++ sysvinit/trunk/debian/initscripts/etc/init.d/checkfs.sh	2005-11-18 15:36:46 UTC (rev 146)
@@ -50,7 +50,7 @@
     	dumb|network|unknown|"") spinner="" ;;
         esac
         [ `uname -m` = s390 ] && spinner="" # This should go away
-	[ "$VERBOSE" != no ] && log_action_msg "Will now check all file systems."
+	[ "$VERBOSE" != no ] && log_action_msg "Will now check all file systems"
 	fsck $spinner -T -R -A $fix $force
         if [ $? -gt 1 ]
         then
@@ -60,7 +60,7 @@
 		# Start a single user shell on the console
 		/sbin/sulogin $CONSOLE
 	else
-		[ "$VERBOSE" != no ] && log_action_msg "Finished checking file systems."
+		[ "$VERBOSE" != no ] && log_action_msg "Done checking file systems"
         fi
     fi
     rm -f /fastboot /forcefsck

Modified: sysvinit/trunk/debian/initscripts/etc/init.d/checkroot.sh
===================================================================
--- sysvinit/trunk/debian/initscripts/etc/init.d/checkroot.sh	2005-11-18 15:14:20 UTC (rev 145)
+++ sysvinit/trunk/debian/initscripts/etc/init.d/checkroot.sh	2005-11-18 15:36:46 UTC (rev 146)
@@ -260,7 +260,7 @@
 		fi
 		log_action_msg "Will now check root file system"
 		fsck $spinner $force $fix -T -t $roottype $rootdev
-		log_action_msg "Finished checking root file system"
+		log_action_msg "Done checking root file system"
 		FSCKCODE=$?
 	fi
 

Modified: sysvinit/trunk/debian/initscripts/etc/init.d/mountall.sh
===================================================================
--- sysvinit/trunk/debian/initscripts/etc/init.d/mountall.sh	2005-11-18 15:14:20 UTC (rev 145)
+++ sysvinit/trunk/debian/initscripts/etc/init.d/mountall.sh	2005-11-18 15:36:46 UTC (rev 146)
@@ -36,9 +36,9 @@
 		MOUNT_MESSAGE_TO_PRINT="$(echo "$MOUNT_MESSAGES" | egrep -m 1 -v '(already|nothing was) mounted')"
 		[ "$MOUNT_MESSAGE_TO_PRINT" ] && log_action_cont_msg "(${MOUNT_MESSAGE_TO_PRINT})"
 		if [ 96 = $ES ] || [ 0 = $ES ]; then
-			log_end_msg 0
+			log_action_end_msg 0
 		else
-			log_end_msg 1
+			log_action_end_msg 1
 		fi
 	else
 		for MOUNT_MESSAGE_TO_PRINT in $(echo "$MOUNT_MESSAGES" | egrep -v '(already|nothing was) mounted') ; do