rpms/dhcp/devel 10-dhclient,1.1,1.2 dhcp.spec,1.267,1.268

[David Cantrell]

Author: dcantrel

Update of /cvs/pkgs/rpms/dhcp/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21872

Modified Files:
	10-dhclient dhcp.spec 
Log Message:
* Wed Aug 12 2009 David Cantrell <dcantrell at redhat.com> - 12:4.1.0p1-3
- Update NetworkManager dispatcher script to remove case conversion
  and source /etc/sysconfig/network



Index: 10-dhclient
===================================================================
RCS file: /cvs/pkgs/rpms/dhcp/devel/10-dhclient,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- 10-dhclient	24 Jul 2009 03:07:41 -0000	1.1
+++ 10-dhclient	12 Aug 2009 21:04:26 -0000	1.2
@@ -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
 


Index: dhcp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dhcp/devel/dhcp.spec,v
retrieving revision 1.267
retrieving revision 1.268
diff -u -p -r1.267 -r1.268
--- dhcp.spec	6 Aug 2009 21:45:18 -0000	1.267
+++ dhcp.spec	12 Aug 2009 21:04:26 -0000	1.268
@@ -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 <dcantrell at redhat.com> - 12:4.1.0p1-3
+- Update NetworkManager dispatcher script to remove case conversion
+  and source /etc/sysconfig/network
+
 * Thu Aug 06 2009 David Cantrell <dcantrell at redhat.com> - 12:4.1.0p1-2
 - Add /usr/lib[64]/pm-utils/sleep.d/56dhclient to handle suspend and
   resume with active dhclient leases (#479639)