rpms/dhcp/devel dhclient-script,1.11,1.12 dhcp.spec,1.254,1.255

[David Cantrell]

Author: dcantrel

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

Modified Files:
	dhclient-script dhcp.spec 
Log Message:
* Mon Apr 20 2009 David Cantrell <dcantrell at redhat.com> - 12:4.1.0-19
- Restrict interface names given on the dhcpd command line to length
  IFNAMSIZ or shorter (#441524)
- Change to /etc/sysconfig/network-scripts in dhclient-script before
  calling need_config or source_config (#496233)



Index: dhclient-script
===================================================================
RCS file: /cvs/pkgs/rpms/dhcp/devel/dhclient-script,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- dhclient-script	21 Apr 2009 01:14:15 -0000	1.11
+++ dhclient-script	21 Apr 2009 20:41:30 -0000	1.12
@@ -420,7 +420,8 @@
     . /etc/sysconfig/networking/network
 fi
 
-CONFIG="/etc/sysconfig/network-scripts/ifcfg-${interface}"
+cd /etc/sysconfig/network-scripts
+CONFIG="ifcfg-${interface}"
 need_config ${CONFIG}
 source_config >/dev/null 2>&1
 


Index: dhcp.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dhcp/devel/dhcp.spec,v
retrieving revision 1.254
retrieving revision 1.255
diff -u -r1.254 -r1.255
--- dhcp.spec	21 Apr 2009 02:39:32 -0000	1.254
+++ dhcp.spec	21 Apr 2009 20:41:30 -0000	1.255
@@ -426,6 +426,8 @@
 * Mon Apr 20 2009 David Cantrell <dcantrell at redhat.com> - 12:4.1.0-19
 - Restrict interface names given on the dhcpd command line to length
   IFNAMSIZ or shorter (#441524)
+- Change to /etc/sysconfig/network-scripts in dhclient-script before
+  calling need_config or source_config (#496233)
 
 * Mon Apr 20 2009 David Cantrell <dcantrell at redhat.com> - 12:4.1.0-18
 - Make dhclient-script work with pre-configured wireless interfaces (#491157)