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

[pere at alioth.debian.org]

Author: pere
Date: 2007-12-29 15:28:30 +0000 (Sat, 29 Dec 2007)
New Revision: 1150

Modified:
   sysvinit/trunk/debian/changelog
   sysvinit/trunk/debian/initscripts/etc/init.d/mountoverflowtmp
Log:
  * Reduce output from init.d/mountoverflowtmp when VERBOSE!=yes.

Modified: sysvinit/trunk/debian/changelog
===================================================================
--- sysvinit/trunk/debian/changelog	2007-12-29 15:18:47 UTC (rev 1149)
+++ sysvinit/trunk/debian/changelog	2007-12-29 15:28:30 UTC (rev 1150)
@@ -3,6 +3,7 @@
   * UNRELEASED
   * Remove debug code from init.d/mountoverflowtmp that was included by
     mistake.
+  * Reduce output from init.d/mountoverflowtmp when VERBOSE!=yes.
 
  -- Petter Reinholdtsen <pere at debian.org>  Sat, 29 Dec 2007 16:18:17 +0100
 

Modified: sysvinit/trunk/debian/initscripts/etc/init.d/mountoverflowtmp
===================================================================
--- sysvinit/trunk/debian/initscripts/etc/init.d/mountoverflowtmp	2007-12-29 15:18:47 UTC (rev 1149)
+++ sysvinit/trunk/debian/initscripts/etc/init.d/mountoverflowtmp	2007-12-29 15:28:30 UTC (rev 1150)
@@ -10,6 +10,7 @@
 #                    otherwise be too little space to log in.
 ### END INIT INFO
 
+. /lib/init/vars.sh
 . /lib/lsb/init-functions
 
 set -e
@@ -22,11 +23,11 @@
 
 case "$1" in
   start)
-	log_action_begin_msg "Checking minimum space in /tmp"
+	[ "$VERBOSE" != no ] && log_action_begin_msg "Checking minimum space in /tmp"
 	df="`df -kP /tmp |grep -v Filesystem`"
 	set -- $df
 	avail="$4"
-	log_action_end_msg 0
+	[ "$VERBOSE" != no ] && log_action_end_msg 0
 	if test $avail -lt "$MINTMPKB"; then
 		log_action_begin_msg "Mounting emergency tmpfs on /tmp"
 		mount -t tmpfs -o size=1048576,mode=1777 overflow /tmp
@@ -38,12 +39,12 @@
 	exit 3
 	;;
   stop)
-	log_action_begin_msg "Unmounting any overflow tmpfs from /tmp"
 	if LANG=C LC_ALL=C mount | \
 		grep '^overflow on /tmp type tmpfs' >/dev/null; then
+		log_action_begin_msg "Unmounting any overflow tmpfs from /tmp"
 		umount overflow
+		log_action_end_msg 0
 	fi
-	log_action_end_msg 0
 	;;
   *)
 	echo "Usage: mountoverflowtmp [start|stop]" >&2