[Pkg-sysvinit-commits] r852 - in sysvinit/trunk/debian: . initscripts/etc/init.d

[Petter Reinholdtsen]

Author: pere
Date: 2006-09-06 15:20:50 +0000 (Wed, 06 Sep 2006)
New Revision: 852

Modified:
   sysvinit/trunk/debian/changelog
   sysvinit/trunk/debian/initscripts/etc/init.d/checkroot.sh
   sysvinit/trunk/debian/initscripts/etc/init.d/mountall.sh
   sysvinit/trunk/debian/initscripts/etc/init.d/umountfs
Log:
  * Make some log messages more usplash friendly in the VERBOSE=yes case.

Modified: sysvinit/trunk/debian/changelog
===================================================================
--- sysvinit/trunk/debian/changelog	2006-09-06 13:33:36 UTC (rev 851)
+++ sysvinit/trunk/debian/changelog	2006-09-06 15:20:50 UTC (rev 852)
@@ -1,3 +1,9 @@
+sysvinit (2.86.ds1-17~1) unstable; urgency=low
+
+  * Make some log messages more usplash friendly in the VERBOSE=yes case.
+
+ -- Petter Reinholdtsen <pere at debian.org>  Wed,  6 Sep 2006 17:17:16 +0200
+
 sysvinit (2.86.ds1-16) unstable; urgency=low
 
   * Fix emergency mode's tty, making sure ^C and ^Z work when booting

Modified: sysvinit/trunk/debian/initscripts/etc/init.d/checkroot.sh
===================================================================
--- sysvinit/trunk/debian/initscripts/etc/init.d/checkroot.sh	2006-09-06 13:33:36 UTC (rev 851)
+++ sysvinit/trunk/debian/initscripts/etc/init.d/checkroot.sh	2006-09-06 15:20:50 UTC (rev 852)
@@ -123,15 +123,9 @@
 			swapon -a -e >/dev/null 2>&1
 			log_action_end_msg $?
 		else
-			log_action_msg "Will now activate swap"
+			log_daemon_msg "Activating swap"
 			swapon -a -v
-			ES=$?
-			if [ "$ES" = 0 ]
-			then
-				log_success_msg "Done activating swap."
-			else
-				log_failure_msg "Swap activation failed with error code ${ES}."
-			fi
+			log_end_msg $?
 		fi
 	fi
 
@@ -275,17 +269,10 @@
 				log_action_end_msg 1 "code $FSCKCODE"
 			fi
 		else
-			log_action_msg "Will now check root file system"
+			log_daemon_msg "Will now check root file system"
 			logsave -s $FSCK_LOGFILE fsck $spinner $force $fix -V -t $roottype $rootdev
 			FSCKCODE=$?
-			if [ "$FSCKCODE" = 0 ]
-			then
-				log_success_msg "Done checking root file system. 
-A log will be saved in ${FSCK_LOGFILE} if that location is writable."
-			else
-				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
+			log_end_msg $FSCKCODE
 		fi
 	fi
 

Modified: sysvinit/trunk/debian/initscripts/etc/init.d/mountall.sh
===================================================================
--- sysvinit/trunk/debian/initscripts/etc/init.d/mountall.sh	2006-09-06 13:33:36 UTC (rev 851)
+++ sysvinit/trunk/debian/initscripts/etc/init.d/mountall.sh	2006-09-06 15:20:50 UTC (rev 852)
@@ -41,18 +41,12 @@
 			log_action_end_msg 1 "code $ES_TO_REPORT"
 		fi
 	else
-		log_action_msg "Will now mount local filesystems"
+		log_daemon_msg "Will now mount local filesystems"
 		mount -a -t proc >/dev/null 2>&1  # Ignore error message due to /proc already being mounted
 		ES=$?
 		[ 0 = "$ES" ] || log_failure_msg "Mounting proc filesystems failed with error code ${ES}."
 		mount_all_local
-		ES=$?
-		if [ 0 = "$ES" ]
-		then
-			log_success_msg "Done mounting local filesystems."
-		else
-			log_failure_msg "Mounting local filesystems failed with error code ${ES}."
-		fi
+		log_end_msg $?
 	fi
 	post_mountall
 
@@ -88,9 +82,9 @@
 		swapon -a -e 2>/dev/null || :  # Stifle "Device or resource busy"
 		log_action_end_msg 0
 	else
-		log_action_msg "Will now activate swapfile swap"
-		swapon -a -e -v || :
-		log_success_msg "Done activating swapfile swap."
+		log_daemon_msg "Will now activate swapfile swap"
+		swapon -a -e -v
+		log_action_end_msg $?
 	fi
 }
 

Modified: sysvinit/trunk/debian/initscripts/etc/init.d/umountfs
===================================================================
--- sysvinit/trunk/debian/initscripts/etc/init.d/umountfs	2006-09-06 13:33:36 UTC (rev 851)
+++ sysvinit/trunk/debian/initscripts/etc/init.d/umountfs	2006-09-06 15:20:50 UTC (rev 852)
@@ -98,15 +98,9 @@
 			umount $TMPFS_MTPTS
 			log_action_end_msg $?
 		else
-			log_action_msg "Will now unmount temporary filesystems"
+			log_daemon_msg "Will now unmount temporary filesystems"
 			umount -v $TMPFS_MTPTS
-			ES=$?
-			if [ "$ES" = 0 ]
-			then
-				log_success_msg "Done unmounting temporary filesystems."
-			else
-				log_failure_msg "Unmounting temporary filesystems failed with error code ${ES}."
-			fi
+			log_end_msg $?
 		fi
 	fi
 
@@ -119,15 +113,9 @@
 		swapoff -a >/dev/null
 		log_action_end_msg $?
 	else
-		log_action_msg "Will now deactivate swap"
+		log_daemon_msg "Will now deactivate swap"
 		swapoff -a -v
-		ES=$?
-		if [ "$ES" = 0 ]
-		then
-			log_success_msg "Done deactivating swap."
-		else
-			log_failure_msg "Swap deactivation failed with error code ${ES}."
-		fi
+		log_end_msg $?
 	fi
 
 	#
@@ -142,15 +130,9 @@
 			umount -f -r -d $REG_MTPTS
 			log_action_end_msg $?
 		else
-			log_action_msg "Will now unmount local filesystems"
+			log_daemon_msg "Will now unmount local filesystems"
 			umount -f -v -r -d $REG_MTPTS
-			ES=$?
-			if [ "$ES" = 0 ]
-			then
-				log_success_msg "Done unmounting local filesystems."
-			else
-				log_failure_msg "Unmounting local filesystems failed with error code ${ES}."
-			fi
+			log_end_msg $?
 		fi
 	fi
 }