rpms/dhcp
6
0
Fork 0
Code Issues Pull Requests Releases Activity

Add DHCRELAYARGS variable to /etc/sysconfig/dhcrelay

Browse Source
This commit is contained in:
Jiri Popelka 2010-08-20 17:10:04 +02:00
parent 9ba8b65c5c
commit 027db6fe99
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
dhcp.spec
View File

@ -7,7 +7,7 @@
Summary: Dynamic host configuration protocol software Summary: Dynamic host configuration protocol software
Name: dhcp Name: dhcp
Version: 4.2.0 Version: 4.2.0
Release: 2%{?dist} Release: 3%{?dist}
# NEVER CHANGE THE EPOCH on this package. The previous maintainer (prior to # NEVER CHANGE THE EPOCH on this package. The previous maintainer (prior to
# dcantrell maintaining the package) made incorrect use of the epoch and # 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. # that's why it is at 12 now. It should have never been used, but it was.
@ -323,7 +323,10 @@ touch %{buildroot}%{_localstatedir}/lib/dhcpd/dhcpd6.leases
%{__cat} << EOF > %{buildroot}%{_sysconfdir}/sysconfig/dhcrelay %{__cat} << EOF > %{buildroot}%{_sysconfdir}/sysconfig/dhcrelay
# Command line options here # Command line options here
DHCRELAYARGS=""
# DHCPv4 only
INTERFACES="" INTERFACES=""
# DHCPv4 only
DHCPSERVERS="" DHCPSERVERS=""
EOF EOF
@ -504,6 +507,9 @@ fi
%attr(0644,root,root) %{_mandir}/man3/omapi.3.gz %attr(0644,root,root) %{_mandir}/man3/omapi.3.gz
%changelog %changelog
* Fri Aug 20 2010 Jiri Popelka <jpopelka@redhat.com> - 12:4.2.0-3
- Add DHCRELAYARGS variable to /etc/sysconfig/dhcrelay
* Fri Jul 30 2010 Jiri Popelka <jpopelka@redhat.com> - 12:4.2.0-2 * Fri Jul 30 2010 Jiri Popelka <jpopelka@redhat.com> - 12:4.2.0-2
- Add 12-dhcpd NM dispatcher script (#565921) - Add 12-dhcpd NM dispatcher script (#565921)
- Rename 10-dhclient to 11-dhclient (10-sendmail already exists) - Rename 10-dhclient to 11-dhclient (10-sendmail already exists)

2
dhcrelay.init
View File

@ -58,7 +58,7 @@ start() {
rh_status_q && return 0 rh_status_q && return 0
echo -n $"Starting $prog: " 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=$? RETVAL=$?
echo echo
[ $RETVAL -eq 0 ] && touch $lockfile [ $RETVAL -eq 0 ] && touch $lockfile