Bug#297997: Patch to improve initscript output

[Thomas Hood]

Package: openvpn
Version: 1.99+2.rc16-1
Severity: minor
Tags: patch

Here is a patch which brings the initscript into line with the standard
message format:

   Starting <description of service>: <servicename>.



-- System Information:
Debian Release: 3.1
  APT prefers testing
  APT policy: (500, 'testing'), (50, 'unstable'), (1, 'experimental')
Architecture: i386 (i686)
Kernel: Linux 2.6.10
Locale: [EMAIL PROTECTED], [EMAIL PROTECTED] (charmap=ISO-8859-15)

Versions of packages openvpn depends on:
ii  debconf                     1.4.32       Debian configuration management sy
ii  libc6                       2.3.2.ds1-20 GNU C Library: Shared libraries an
ii  liblzo1                     1.08-1.2     A real-time data compression libra
ii  libssl0.9.7                 0.9.7e-2     SSL shared libraries

-- debconf information:
  openvpn/change_init: true
* openvpn/stop2upgrade: true
  openvpn/default_port:
  openvpn/create_tun: false

--- openvpn_ORIG        2005-02-06 11:49:35.000000000 +0100
+++ openvpn     2005-03-03 22:26:24.000000000 +0100
@@ -8,6 +8,7 @@
 test $DEBIAN_SCRIPT_DEBUG && set -v -x
 
 DAEMON=/usr/sbin/openvpn
+DESC="virtual private network daemon"
 CONFIG_DIR=/etc/openvpn
 test -x $DAEMON || exit 0
 test -d $CONFIG_DIR || exit 0
@@ -34,9 +35,9 @@
 
 case "$1" in
 start)
-  echo -n "Starting openvpn:"
+  echo -n "Starting $DESC:"
 
-  if test -z $2 ; then
+  if test -z "$2" ; then
     for CONFIG in `cd $CONFIG_DIR; ls *.conf 2> /dev/null`; do
       NAME=${CONFIG%%.conf}
       start_vpn
@@ -48,7 +49,7 @@
         NAME=$1
         start_vpn
       else
-        echo -n " No such VPN: $1"
+        echo -n " (failure: No such VPN: $1)"
       fi
     done
   fi
@@ -56,9 +57,9 @@
 
   ;;
 stop)
-  echo -n "Stopping openvpn:"
+  echo -n "Stopping $DESC:"
 
-  if test -z $2 ; then
+  if test -z "$2" ; then
     for PIDFILE in `ls /var/run/openvpn.*.pid 2> /dev/null`; do
       NAME=`echo $PIDFILE | cut -c18-`
       NAME=${NAME%%.pid}
@@ -75,7 +76,7 @@
         stop_vpn
         echo -n " $NAME"
       else
-        echo -n " No such running VPN: $1"
+        echo -n " (failure: No such VPN is running: $1)"
       fi
     done
   fi
@@ -83,7 +84,7 @@
   ;;
 # We only 'reload' for running VPNs. New ones will only start with 'start' or 
'restart'.
 reload|force-reload)
-  echo -n "Reloading openvpn:"
+  echo -n "Reloading $DESC:"
   for PIDFILE in `ls /var/run/openvpn.*.pid 2> /dev/null`; do
     NAME=`echo $PIDFILE | cut -c18-`
     NAME=${NAME%%.pid}