[prev in list] [next in list] [prev in thread] [next in thread] 

List:       annvix-cvs
Subject:    [cvs] CVS commit in packages/dhcp on 2005/09/28 04:40:38
From:       cvsrep () annvix ! org
Date:       2005-09-28 4:40:40
Message-ID: E1EKTkG-00033r-CW () build ! annvix ! org
[Download RAW message or body]

Module name:   packages/dhcp
Changes by:    vdanen
Date:          2005/09/28 04:40:38

Commit log:
- quote the args in the runscripts

Index: dhcp.spec
===================================================================
RCS file: /work/annvix/cvsroot/packages/dhcp/dhcp.spec,v
retrieving revision 1.3.4.5
retrieving revision 1.3.4.6
diff -u -r1.3.4.5 -r1.3.4.6
--- dhcp.spec	26 Sep 2005 08:28:18 -0000	1.3.4.5
+++ dhcp.spec	28 Sep 2005 04:40:38 -0000	1.3.4.6
@@ -9,7 +9,7 @@
 
 %define name		dhcp
 %define version		3.0.3
-%define release		2avx
+%define release		3avx
 %define epoch		2
 
 %define _catdir		/var/cache/man
@@ -302,6 +302,9 @@
 
 
 %changelog
+* Tue Sep 27 2005 Vincent Danen <vdanen@annvix.org> 3.0.3-3avx
+- quote the args in the runscripts
+
 * Sun Sep 25 2005 Sean P. Thomas <spt@annvix.org> 3.0.3-2avx
 - use execlineb for run scripts and used envdirs.
 - pass -d to dhcpd in run script to log to stderr (vdanen)

Index: dhcpd.run
===================================================================
RCS file: /work/annvix/cvsroot/packages/dhcp/dhcpd.run,v
retrieving revision 1.3.4.1
retrieving revision 1.3.4.2
diff -u -r1.3.4.1 -r1.3.4.2
--- dhcpd.run	26 Sep 2005 08:28:18 -0000	1.3.4.1
+++ dhcpd.run	28 Sep 2005 04:40:38 -0000	1.3.4.2
@@ -11,16 +11,16 @@
     import INTERFACES
 }
 
-/bin/ifthenelse { /usr/bin/test ! -f $CONFIGFILE }
+/bin/ifthenelse { /usr/bin/test ! -f ${CONFIGFILE} }
 {
     /bin/echo "The configuration file does not exist, unable to start!"
 }
 {
-    /bin/ifthenelse { /usr/bin/test ! -f $LEASEFILE }
+    /bin/ifthenelse { /usr/bin/test ! -f ${LEASEFILE} }
     {
         /bin/echo "The lease file does not exist, unable to start!"
     }
     {
-        /usr/sbin/dhcpd -d -f -user dhcp -group dhcp -cf $CONFIGFILE -lf $LEASEFILE \
$OPTIONS $INTERFACES +        /usr/sbin/dhcpd "-d -f -user dhcp -group dhcp -cf \
${CONFIGFILE} -lf ${LEASEFILE} ${OPTIONS} ${INTERFACES}"  }
 }

Index: dhcrelay.run
===================================================================
RCS file: /work/annvix/cvsroot/packages/dhcp/dhcrelay.run,v
retrieving revision 1.3.4.1
retrieving revision 1.3.4.2
diff -u -r1.3.4.1 -r1.3.4.2
--- dhcrelay.run	26 Sep 2005 08:28:18 -0000	1.3.4.1
+++ dhcrelay.run	28 Sep 2005 04:40:38 -0000	1.3.4.2
@@ -14,5 +14,5 @@
     /bin/echo "I need at least one dhcp server to relay from... please set SERVERS \
in the ./env!"  }
 {
-    /usr/sbin/dhcrelay -d $OPTIONS $SERVERS
+    /usr/sbin/dhcrelay "-d ${OPTIONS} ${SERVERS}"
 }


_______________________________________________
cvs mailing list
cvs@annvix.org
http://annvix.org/mailman/listinfo/cvs


[prev in list] [next in list] [prev in thread] [next in thread]