From 1775397c23b43a8ea8ef613b58d0d7b9c1ccf4c1 Mon Sep 17 00:00:00 2001 From: David Cantrell Date: Aug 12 2009 21:04:26 +0000 Subject: - Update NetworkManager dispatcher script to remove case conversion and source /etc/sysconfig/network --- diff --git a/10-dhclient b/10-dhclient index 43c7691..5842f82 100755 --- a/10-dhclient +++ b/10-dhclient @@ -1,19 +1,23 @@ #!/bin/bash # run dhclient.d scripts in an emulated environment +PATH=/bin:/usr/bin:/sbin SAVEDIR=/var/lib/dhclient ETCDIR=/etc/dhcp interface=$1 eval "$( declare | LC_ALL=C grep '^DHCP4_[A-Z_]*=' | while read opt; do - optname=$(echo "${opt%%=*}" | LC_ALL=C tr 'A-Z' 'a-z') + optname=${opt%%=*} + optname=${optname,,} optname=new_${optname#dhcp4_} optvalue=${opt#*=} echo "$optname=$optvalue" done )" +[ -f /etc/sysconfig/network ] && . /etc/sysconfig/network + [ -f /etc/sysconfig/network-scripts/ifcfg-$interface ] && \ . /etc/sysconfig/network-scripts/ifcfg-$interface diff --git a/dhcp.spec b/dhcp.spec index 1b8c092..24ea69e 100644 --- a/dhcp.spec +++ b/dhcp.spec @@ -13,7 +13,7 @@ Summary: Dynamic host configuration protocol software Name: dhcp Version: %{basever}p1 -Release: 2%{?dist} +Release: 3%{?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. @@ -471,6 +471,10 @@ fi %attr(0644,root,root) %{_mandir}/man3/omapi.3.gz %changelog +* Wed Aug 12 2009 David Cantrell - 12:4.1.0p1-3 +- Update NetworkManager dispatcher script to remove case conversion + and source /etc/sysconfig/network + * Thu Aug 06 2009 David Cantrell - 12:4.1.0p1-2 - Add /usr/lib[64]/pm-utils/sleep.d/56dhclient to handle suspend and resume with active dhclient leases (#479639)