SOURCES: openlldp-lldp.init - wrap for readability - no need for f...

glen glen at pld-linux.org
Wed Jan 23 09:45:28 CET 2008


Author: glen                         Date: Wed Jan 23 08:45:28 2008 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- wrap for readability
- no need for fixed strings to quote for spaces

---- Files affected:
SOURCES:
   openlldp-lldp.init (1.3 -> 1.4) 

---- Diffs:

================================================================
Index: SOURCES/openlldp-lldp.init
diff -u SOURCES/openlldp-lldp.init:1.3 SOURCES/openlldp-lldp.init:1.4
--- SOURCES/openlldp-lldp.init:1.3	Wed Jan 23 09:42:29 2008
+++ SOURCES/openlldp-lldp.init	Wed Jan 23 09:45:23 2008
@@ -36,10 +36,21 @@
 		msg_starting lldpd
 		# Default debug switch "n". Default log file /var/log/lldpd.log
 		# For now use start-stop-daemon. Need to patch code for daemonizing
-		start-stop-daemon --start --background --pidfile /var/run/lldpd.pid --make-pidfile --exec /usr/sbin/lldpd -- -d ${LLDP_DEBUG:-n} >> "${LLDP_LOG_FILE:-/var/log/lldpd.log}"
+		start-stop-daemon \
+			--start \
+			--background \
+			--pidfile /var/run/lldpd.pid \
+			--make-pidfile \
+			--exec /usr/sbin/lldpd -- \
+			-d ${LLDP_DEBUG:-n} \
+			>> ${LLDP_LOG_FILE:-/var/log/lldpd.log}
 		RETVAL=$?
-		[ $RETVAL -eq 0 ] && touch /var/lock/subsys/lldpd
-		ok
+		if [ $RETVAL -eq 0 ]; then
+		   	touch /var/lock/subsys/lldpd
+			ok
+		else
+			fail
+		fi
 	else
 		msg_already_running lldpd
 	fi
@@ -50,8 +61,8 @@
 	if [ -f /var/lock/subsys/lldpd ]; then
 		msg_stopping lldpd
 		start-stop-daemon --stop --pidfile /var/run/lldpd.pid --name lldpd
-		rm -f /var/lock/subsys/lldpd /var/run/lldpd.pid
 		ok
+		rm -f /var/lock/subsys/lldpd /var/run/lldpd.pid
 	else
 		msg_not_running lldpd
 	fi
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/openlldp-lldp.init?r1=1.3&r2=1.4&f=u



More information about the pld-cvs-commit mailing list