[dhcp/f13/master] Add DHCRELAYARGS variable to /etc/sysconfig/dhcrelay

[Jiří Popelka]

commit 1eb7b33d5572d8c8dc3230ae3204f674bee3ca42
Author: Jiri Popelka <jpopelka at redhat.com>
Date:   Fri Aug 20 17:10:04 2010 +0200

    Add DHCRELAYARGS variable to /etc/sysconfig/dhcrelay

 dhcp.spec     |    8 +++++++-
 dhcrelay.init |    2 +-
 2 files changed, 8 insertions(+), 2 deletions(-)
---
diff --git a/dhcp.spec b/dhcp.spec
index ac8e649..a64cece 100644
--- a/dhcp.spec
+++ b/dhcp.spec
@@ -15,7 +15,7 @@
 Summary:  Dynamic host configuration protocol software
 Name:     dhcp
 Version:  4.1.1
-Release:  23.%{patchver}%{?dist}
+Release:  24.%{patchver}%{?dist}
 # NEVER CHANGE THE EPOCH on this package.  The previous maintainer (prior to
 # dcantrell maintaining the package) made incorrect use of the epoch and
 # that's why it is at 12 now.  It should have never been used, but it was.
@@ -348,7 +348,10 @@ touch %{buildroot}%{_localstatedir}/lib/dhcpd/dhcpd6.leases
 
 %{__cat} << EOF > %{buildroot}%{_sysconfdir}/sysconfig/dhcrelay
 # Command line options here
+DHCRELAYARGS=""
+# DHCPv4 only
 INTERFACES=""
+# DHCPv4 only
 DHCPSERVERS=""
 EOF
 
@@ -525,6 +528,9 @@ fi
 %attr(0644,root,root) %{_mandir}/man3/omapi.3.gz
 
 %changelog
+* Fri Aug 20 2010 Jiri Popelka <jpopelka at redhat.com> - 12:4.1.1-24.P1
+- Add DHCRELAYARGS variable to /etc/sysconfig/dhcrelay
+
 * Tue Jun 29 2010 Jiri Popelka <jpopelka at redhat.com> - 12:4.1.1-23.P1
 - Fix parsing of date (#514828)
 
diff --git a/dhcrelay.init b/dhcrelay.init
index e0094ce..33bad2c 100644
--- a/dhcrelay.init
+++ b/dhcrelay.init
@@ -58,7 +58,7 @@ start() {
     rh_status_q && return 0
 
     echo -n $"Starting $prog: "
-    daemon $exec $([ -n "$INTERFACES" ] && for int in $INTERFACES ; do echo -n " -i $int" ; done) $DHCPSERVERS 2>/dev/null
+    daemon $exec $DHCRELAYARGS $([ -n "$INTERFACES" ] && for int in $INTERFACES ; do echo -n " -i $int" ; done) $DHCPSERVERS 2>/dev/null
     RETVAL=$?
     echo
     [ $RETVAL -eq 0 ] && touch $lockfile