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

[Thomas Hood]

Author: jdthood-guest
Date: 2006-02-01 16:23:21 +0000 (Wed, 01 Feb 2006)
New Revision: 729

Modified:
   sysvinit/trunk/debian/initscripts/etc/init.d/mountall.sh
Log:
Make swapfile-swap message properly verbose in VERBOSE mode and add non-verbose message

Modified: sysvinit/trunk/debian/initscripts/etc/init.d/mountall.sh
===================================================================
--- sysvinit/trunk/debian/initscripts/etc/init.d/mountall.sh	2006-02-01 16:22:36 UTC (rev 728)
+++ sysvinit/trunk/debian/initscripts/etc/init.d/mountall.sh	2006-02-01 16:23:21 UTC (rev 729)
@@ -74,14 +74,17 @@
 	# Execute swapon command again, in case we want to swap to
 	# a file on a now mounted filesystem.
 	#
+	# Ignore 255 status due to swap already being enabled
+	#
 	if [ "$VERBOSE" = no ]
 	then
-		swapon -a -e 2>/dev/null || :    # Stifle "Device or resource busy"
+		log_action_begin_msg "Activating swapfile swap"
+		swapon -a -e 2>/dev/null || :  # Stifle "Device or resource busy"
+		log_action_end_msg 0
 	else
-		log_action_begin_msg "Activating swapfile swap"
+		log_action_msg "Activating swapfile swap"
 		swapon -a -e -v || :
-		# Ignore 255 status
-		log_action_end_msg 0
+		log_success_msg "Done activating swapfile swap."
 	fi
 }