From ee1046393e1b7248b9e1faf8a6f3cde7969291c4 Mon Sep 17 00:00:00 2001 From: David Cantrell Date: Wed, 26 Mar 2008 04:53:54 +0000 Subject: [PATCH] - Update dhclient-script to handle domain-search correctly (#437840) --- dhcp.spec | 5 ++++- linux | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/dhcp.spec b/dhcp.spec index ee9eaeb..92bffd4 100644 --- a/dhcp.spec +++ b/dhcp.spec @@ -4,7 +4,7 @@ Summary: DHCP (Dynamic Host Configuration Protocol) server and relay agent Name: dhcp Version: 4.0.0 -Release: 12%{?dist} +Release: 13%{?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. @@ -414,6 +414,9 @@ fi %{_libdir}/libdhcp4client.so %changelog +* Tue Mar 25 2008 David Cantrell - 12:4.0.0-13 +- Update dhclient-script to handle domain-search correctly (#437840) + * Tue Mar 25 2008 David Cantrell - 12:4.0.0-12 - Remove Requires on openldap-server (#432180) - Replace CLIENTBINDIR, ETCDIR, DBDIR, and RUNDIR in the man pages with the diff --git a/linux b/linux index b552431..8476cb9 100755 --- a/linux +++ b/linux @@ -47,8 +47,8 @@ make_resolv_conf() { rscf=`mktemp /tmp/XXXXXX`; echo '; generated by /sbin/dhclient-script' > $rscf - if [ -n "$SEARCH" ]; then - echo search $SEARCH >> $rscf + if [ -n "$new_domain_search" ]; then + echo search $new_domain_search >> $rscf else if [ -n "$new_domain_name" ]; then echo search $new_domain_name >> $rscf