SOURCES: openvpn.init - tabs, typos todos

glen glen at pld-linux.org
Fri Jul 1 00:46:32 CEST 2005


Author: glen                         Date: Thu Jun 30 22:46:32 2005 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- tabs, typos todos

---- Files affected:
SOURCES:
   openvpn.init (1.15 -> 1.16) 

---- Diffs:

================================================================
Index: SOURCES/openvpn.init
diff -u SOURCES/openvpn.init:1.15 SOURCES/openvpn.init:1.16
--- SOURCES/openvpn.init:1.15	Fri Aug 13 15:33:54 2004
+++ SOURCES/openvpn.init	Fri Jul  1 00:46:27 2005
@@ -56,6 +56,7 @@
 	if [ -f /var/lock/subsys/openvpn ]; then
 		# Stop daemons.
 		msg_stopping "OpenVPN"; started
+		# FIXME: doesn't respect $TUNNELS
 		for pidfile in /var/run/openvpn/*.pid ; do
 			[ -f "$pidfile" ] || continue
 			pid=`cat "$pidfile"`
@@ -65,7 +66,8 @@
 				died
 				continue
 			fi
-			kill -TERM $pid >/dev/null 2>&1 
+			# FIXME: why not killproc? it has pidfile support!
+			kill -TERM $pid >/dev/null 2>&1
 			usleep 100000
 			if ps h $pid >/dev/null 2>&1 ; then
 				sleep 1
@@ -96,10 +98,10 @@
 			[ $? -ne 0 -a $RETVAL -eq 0 ] && RETVAL=7
 		done
 		[ $RETVAL -eq 0 ] && ok || died
-        else
-                msg_not_running OpenSSH >&2
-                exit 7
-	fi 		
+	else
+		msg_not_running OpenVPN >&2
+		exit 7
+	fi
 	;;
   restart)
 	$0 stop "$TUNNELS"
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/openvpn.init?r1=1.15&r2=1.16&f=u




More information about the pld-cvs-commit mailing list