commit c5123f398236540a572be28fb9c8e2fd09ca7eea
author Adam Spiers <aspiers@suse.com> Mon Feb 23 15:28:39 2015 +0000
committer Willy Tarreau <w@1wt.eu> Mon Feb 23 18:13:14 2015 +0100
tree 11e1250f0265f053b32e5ebda0b123a9f34ac661
parent 922a37b2fbde86ff29fd5794c19e49764cb32370

CLEANUP: extract temporary $LOCKFILE to eliminate duplication

Signed-off-by: Adam Spiers <aspiers@suse.com>

examples/haproxy.init

diff --git a/examples/haproxy.init b/examples/haproxy.init
index 2bed3eb..67268eb 100644
--- a/examples/haproxy.init
+++ b/examples/haproxy.init
@@ -38,6 +38,7 @@
 [ -f $CFG ] || exit 1
 
 PIDFILE=/var/run/$BASENAME.pid
+LOCKFILE=/var/lock/subsys/$BASENAME
 
 RETVAL=0
 
@@ -52,7 +53,7 @@
   daemon $BIN -D -f $CFG -p $PIDFILE
   RETVAL=$?
   echo
-  [ $RETVAL -eq 0 ] && touch /var/lock/subsys/$BASENAME
+  [ $RETVAL -eq 0 ] && touch $LOCKFILE
   return $RETVAL
 }
 
@@ -61,7 +62,7 @@
   killproc $BASENAME -USR1
   RETVAL=$?
   echo
-  [ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/$BASENAME
+  [ $RETVAL -eq 0 ] && rm -f $LOCKFILE
   [ $RETVAL -eq 0 ] && rm -f $PIDFILE
   return $RETVAL
 }
@@ -94,7 +95,7 @@
 }
 
 condrestart() {
-  [ -e /var/lock/subsys/$BASENAME ] && restart || :
+  [ -e $LOCKFILE ] && restart || :
 }
 
 # See how we were called.