[Debian-ha-svn-commits] [SCM] corosync Debian packaging branch, master, updated. debian/1.0.0-5

[Guido Günther]

The following commit has been merged in the master branch:
commit b8424d7c2ce92fa9f0bd66f69a69488f298be9d2
Author: Guido Günther <agx at sigxcpu.org>
Date:   Fri Aug 28 07:16:54 2009 +0200

    fix init script logging

diff --git a/debian/corosync.init b/debian/corosync.init
index c47a0df..e8534c8 100644
--- a/debian/corosync.init
+++ b/debian/corosync.init
@@ -33,9 +33,6 @@ if [ "$START" != "yes" ]; then
 	exit 0
 fi
 
-# Load the VERBOSE setting and other rcS variables
-[ -f /etc/default/rcS ] && . /etc/default/rcS
-
 # Define LSB log_* functions.
 # Depend on lsb-base (>= 3.0-6) to ensure that this file is present.
 . /lib/lsb/init-functions
@@ -79,19 +76,19 @@ do_stop()
 
 case "$1" in
   start)
-	[ "$VERBOSE" != no ] && log_daemon_msg "Starting $DESC" "$NAME"
+	log_daemon_msg "Starting $DESC" "$NAME"
 	do_start
 	case "$?" in
-		0|1) [ "$VERBOSE" != no ] && log_end_msg 0 ;;
-		2) [ "$VERBOSE" != no ] && log_end_msg 1 ;;
+		0|1) log_end_msg 0 ;;
+		2) log_end_msg 1 ;;
 	esac
 	;;
   stop)
-	[ "$VERBOSE" != no ] && log_daemon_msg "Stopping $DESC" "$NAME"
+	log_daemon_msg "Stopping $DESC" "$NAME"
 	do_stop
 	case "$?" in
-		0|1) [ "$VERBOSE" != no ] && log_end_msg 0 ;;
-		2) [ "$VERBOSE" != no ] && log_end_msg 1 ;;
+		0|1) log_end_msg 0 ;;
+		2) log_end_msg 1 ;;
 	esac
 	;;
   restart|force-reload)

-- 
corosync Debian packaging