- Update NetworkManager dispatcher script to remove case conversion and

source /etc/sysconfig/network
This commit is contained in:
David Cantrell 2009-08-12 21:04:26 +00:00
parent 348ee0ebdc
commit c3909ac160
2 changed files with 10 additions and 2 deletions

View File

@ -1,19 +1,23 @@
#!/bin/bash #!/bin/bash
# run dhclient.d scripts in an emulated environment # run dhclient.d scripts in an emulated environment
PATH=/bin:/usr/bin:/sbin
SAVEDIR=/var/lib/dhclient SAVEDIR=/var/lib/dhclient
ETCDIR=/etc/dhcp ETCDIR=/etc/dhcp
interface=$1 interface=$1
eval "$( eval "$(
declare | LC_ALL=C grep '^DHCP4_[A-Z_]*=' | while read opt; do 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_} optname=new_${optname#dhcp4_}
optvalue=${opt#*=} optvalue=${opt#*=}
echo "$optname=$optvalue" echo "$optname=$optvalue"
done done
)" )"
[ -f /etc/sysconfig/network ] && . /etc/sysconfig/network
[ -f /etc/sysconfig/network-scripts/ifcfg-$interface ] && \ [ -f /etc/sysconfig/network-scripts/ifcfg-$interface ] && \
. /etc/sysconfig/network-scripts/ifcfg-$interface . /etc/sysconfig/network-scripts/ifcfg-$interface

View File

@ -13,7 +13,7 @@
Summary: Dynamic host configuration protocol software Summary: Dynamic host configuration protocol software
Name: dhcp Name: dhcp
Version: %{basever}p1 Version: %{basever}p1
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.
@ -471,6 +471,10 @@ fi
%attr(0644,root,root) %{_mandir}/man3/omapi.3.gz %attr(0644,root,root) %{_mandir}/man3/omapi.3.gz
%changelog %changelog
* Wed Aug 12 2009 David Cantrell <dcantrell@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@redhat.com> - 12:4.1.0p1-2 * Thu Aug 06 2009 David Cantrell <dcantrell@redhat.com> - 12:4.1.0p1-2
- Add /usr/lib[64]/pm-utils/sleep.d/56dhclient to handle suspend and - Add /usr/lib[64]/pm-utils/sleep.d/56dhclient to handle suspend and
resume with active dhclient leases (#479639) resume with active dhclient leases (#479639)