From 29632077ef733973169251565b459990f3e0f3ec Mon Sep 17 00:00:00 2001 From: David Cantrell Date: Thu, 19 Feb 2009 03:23:10 +0000 Subject: [PATCH] - Correct subsystem execution in dhclient-script (#486251) --- dhclient-script | 5 ++--- dhcp.spec | 5 ++++- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/dhclient-script b/dhclient-script index 2f80356..8fa6ee4 100755 --- a/dhclient-script +++ b/dhclient-script @@ -358,9 +358,8 @@ dhconfig() { if [ -d /etc/dhcp/dhclient.d ]; then for f in /etc/dhcp/dhclient.d/*.sh ; do if [ -x ${f} ]; then - subsystem="$(basename ${f} .sh)" - . ${f} - \${subsystem}_config + subsystem="${f%.sh}" + . ${f} "${subsystem}_config" fi done fi diff --git a/dhcp.spec b/dhcp.spec index a7168d0..0e7979f 100644 --- a/dhcp.spec +++ b/dhcp.spec @@ -4,7 +4,7 @@ Summary: Dynamic host configuration protocol software Name: dhcp Version: 4.1.0 -Release: 7%{?dist} +Release: 8%{?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. @@ -419,6 +419,9 @@ fi %attr(0644,root,root) %{_mandir}/man3/omapi.3.gz %changelog +* Wed Feb 18 2009 David Cantrell - 12:4.1.0-8 +- Correct subsystem execution in dhclient-script (#486251) + * Wed Feb 18 2009 David Cantrell - 12:4.1.0-7 - Do not segfault if the ipv6 kernel module is not loaded (#486097)