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

- Update dhclient-script to handle domain-search correctly (#437840)

Browse Source
This commit is contained in:
David Cantrell 2008-03-26 04:53:54 +00:00
parent 73e1d9998b
commit ee1046393e
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
dhcp.spec
View File

@ -4,7 +4,7 @@
Summary: DHCP (Dynamic Host Configuration Protocol) server and relay agent Summary: DHCP (Dynamic Host Configuration Protocol) server and relay agent
Name: dhcp Name: dhcp
Version: 4.0.0 Version: 4.0.0
Release: 12%{?dist} Release: 13%{?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.
@ -414,6 +414,9 @@ fi
%{_libdir}/libdhcp4client.so %{_libdir}/libdhcp4client.so
%changelog %changelog
* Tue Mar 25 2008 David Cantrell <dcantrell@redhat.com> - 12:4.0.0-13
- Update dhclient-script to handle domain-search correctly (#437840)
* Tue Mar 25 2008 David Cantrell <dcantrell@redhat.com> - 12:4.0.0-12 * Tue Mar 25 2008 David Cantrell <dcantrell@redhat.com> - 12:4.0.0-12
- Remove Requires on openldap-server (#432180) - Remove Requires on openldap-server (#432180)
- Replace CLIENTBINDIR, ETCDIR, DBDIR, and RUNDIR in the man pages with the - Replace CLIENTBINDIR, ETCDIR, DBDIR, and RUNDIR in the man pages with the

4
linux
View File

@ -47,8 +47,8 @@ make_resolv_conf() {
rscf=`mktemp /tmp/XXXXXX`; rscf=`mktemp /tmp/XXXXXX`;
echo '; generated by /sbin/dhclient-script' > $rscf echo '; generated by /sbin/dhclient-script' > $rscf
if [ -n "$SEARCH" ]; then if [ -n "$new_domain_search" ]; then
echo search $SEARCH >> $rscf echo search $new_domain_search >> $rscf
else else
if [ -n "$new_domain_name" ]; then if [ -n "$new_domain_name" ]; then
echo search $new_domain_name >> $rscf echo search $new_domain_name >> $rscf