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

[Thomas Hood]

Author: jdthood-guest
Date: 2006-02-04 15:44:05 +0000 (Sat, 04 Feb 2006)
New Revision: 737

Modified:
   sysvinit/trunk/debian/initscripts/etc/init.d/umountfs
Log:
Make umountfs more verbose

Modified: sysvinit/trunk/debian/initscripts/etc/init.d/umountfs
===================================================================
--- sysvinit/trunk/debian/initscripts/etc/init.d/umountfs	2006-02-04 15:28:14 UTC (rev 736)
+++ sysvinit/trunk/debian/initscripts/etc/init.d/umountfs	2006-02-04 15:44:05 UTC (rev 737)
@@ -49,10 +49,22 @@
 		#
 		if [ "$TMPFS_MTPTS" ]
 		then
-			[ "$VERBOSE" = no ] || log_action_begin_msg "Unmounting temporary filesystems"
-			umount $TMPFS_MTPTS
-			ES=$?
-			[ "$VERBOSE" = no ] || log_action_end_msg $ES
+			if [ "$VERBOSE" = no ]
+			then
+				log_action_begin_msg "Unmounting temporary filesystems"
+				umount $TMPFS_MTPTS
+				log_action_end_msg $?
+			else
+				log_action_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
+			fi
 		fi
 
 		#
@@ -62,7 +74,7 @@
 		then
 			log_action_begin_msg "Deactivating swap"
 			swapoff -a >/dev/null
-			log_action_end_msg $ES
+			log_action_end_msg $?
 		else
 			log_action_msg "Will now deactivate swap"
 			swapoff -a -v
@@ -80,10 +92,22 @@
 		#
 		if [ "$REG_MTPTS" ]
 		then
-			[ "$VERBOSE" = no ] || log_action_begin_msg "Unmounting local filesystems"
-			umount -f -r -d $REG_MTPTS
-			ES=$?
-			[ "$VERBOSE" = no ] || log_action_end_msg $ES
+			if [ "$VERBOSE" = no ]
+			then
+				log_action_begin_msg "Unmounting local filesystems"
+				umount -f -r -d $REG_MTPTS
+				log_action_end_msg $?
+			else
+				log_action_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
+			fi
 		fi
 	)
 }