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

[Thomas Hood]

Author: jdthood-guest
Date: 2005-11-18 14:23:20 +0000 (Fri, 18 Nov 2005)
New Revision: 143

Modified:
   sysvinit/trunk/debian/initscripts/etc/init.d/mountall.sh
Log:
Tweak handling of mount messages

Modified: sysvinit/trunk/debian/initscripts/etc/init.d/mountall.sh
===================================================================
--- sysvinit/trunk/debian/initscripts/etc/init.d/mountall.sh	2005-11-18 14:16:16 UTC (rev 142)
+++ sysvinit/trunk/debian/initscripts/etc/init.d/mountall.sh	2005-11-18 14:23:20 UTC (rev 143)
@@ -31,16 +31,19 @@
 	# It seems to be returned when some mount points were already mounted.
 	MOUNT_MESSAGES="$(mount -av -t nonfs,nonfs4,nosmbfs,nocifs,noncp,noncpfs,nocoda,noocfs2,nogfs 2>&1)"
 	ES=$?
-	MOUNT_MESSAGE_TO_PRINT="$(echo "$MOUNT_MESSAGES" | egrep -m 1 -v '(already|nothing was) mounted')"
 	if [ "$VERBOSE" != no ]; then
-		log_action_cont_msg $MOUNT_MESSAGE_TO_PRINT
+		# Print only the first relevant line
+		MOUNT_MESSAGE_TO_PRINT="$(echo "$MOUNT_MESSAGES" | egrep -m 1 -v '(already|nothing was) mounted')"
+		log_action_cont_msg "(${MOUNT_MESSAGE_TO_PRINT})"
 		if [ 96 = $ES ] || [ 0 = $ES ]; then
 			log_end_msg 0
 		else
 			log_end_msg 1
 		fi
 	else
-		log_warning_msg $MOUNT_MESSAGE_TO_PRINT
+		for MOUNT_MESSAGE_TO_PRINT in $(echo "$MOUNT_MESSAGES" | egrep -v '(already|nothing was) mounted') ; do
+			log_warning_msg $MOUNT_MESSAGE_TO_PRINT
+		done
 	fi
 
 	case `uname -s` in