From 0b566222b2fa0e2e0d5cb504cffffacf87525c52 Mon Sep 17 00:00:00 2001
From: Bill Nottingham <notting@redhat.com>
Date: Tue, 24 Apr 2012 14:37:48 -0400
Subject: Allow dhclient configuration files for DHCPv6 as well. (#815676)

Conflicts:
	sysconfig/network-scripts/ifup-eth
	sysconfig/network-scripts/network-functions
---
 sysconfig/network-scripts/ifup-eth          | 13 +++----------
 sysconfig/network-scripts/network-functions | 11 +++++++++++
 2 files changed, 14 insertions(+), 10 deletions(-)

(limited to 'sysconfig')

diff --git a/sysconfig/network-scripts/ifup-eth b/sysconfig/network-scripts/ifup-eth
index aca72b9c..7210084b 100755
--- a/sysconfig/network-scripts/ifup-eth
+++ b/sysconfig/network-scripts/ifup-eth
@@ -165,15 +165,7 @@ if [ -n "${DYNCONFIG}" -a -x /sbin/dhclient ]; then
     else
        ONESHOT="-1";
     fi;
-    # allow users to use generic '/etc/dhclient.conf' (as documented in manpage!) 
-    # if per-device file doesn't exist or is empty
-    if [ -s /etc/dhcp/dhclient-${DEVICE}.conf ]; then
-       DHCLIENTCONF="-cf /etc/dhcp/dhclient-${DEVICE}.conf";
-    elif [ -s /etc/dhclient-${DEVICE}.conf ]; then
-       DHCLIENTCONF="-cf /etc/dhclient-${DEVICE}.conf";
-    else
-       DHCLIENTCONF='';
-    fi;
+    generate_config_file_name
     # copy any lease obtained by the initrd
     for file in /dev/.dhclient-${DEVICE}.leases /dev/.initramfs/net.${DEVICE}.lease ; do
         if [ -f "${file}" ]; then
@@ -288,7 +280,8 @@ fi
 # IPv6 initialisation?
 /etc/sysconfig/network-scripts/ifup-ipv6 ${CONFIG}
 if [[ "${DHCPV6C}"  = [Yy1]* ]] && [ -x /sbin/dhclient ]; then
-    /sbin/dhclient -6 -1 ${DHCPV6C_OPTIONS} -lf /var/lib/dhclient/dhclient6-${DEVICE}.leases -pf /var/run/dhclient6-${DEVICE}.pid ${DHCP_HOSTNAME:+-H $DHCP_HOSTNAME} ${DEVICE}
+    generate_config_file_name 6
+    /sbin/dhclient -6 -1 ${DHCPV6C_OPTIONS} ${DHCLIENTCONF} -lf /var/lib/dhclient/dhclient6-${DEVICE}.leases -pf /var/run/dhclient6-${DEVICE}.pid ${DHCP_HOSTNAME:+-H $DHCP_HOSTNAME} ${DEVICE}
 fi
 
 exec /etc/sysconfig/network-scripts/ifup-post ${CONFIG} ${2}
diff --git a/sysconfig/network-scripts/network-functions b/sysconfig/network-scripts/network-functions
index cb7c5403..49086328 100644
--- a/sysconfig/network-scripts/network-functions
+++ b/sysconfig/network-scripts/network-functions
@@ -59,6 +59,17 @@ get_uuid_by_config ()
     dbus-send --system --print-reply --dest=com.redhat.ifcfgrh1 /com/redhat/ifcfgrh1 com.redhat.ifcfgrh1.GetIfcfgDetails string:"/etc/sysconfig/network-scripts/$1" 2>/dev/null | awk -F '"' '/string / { print $2 }'
 }
 
+generate_config_file_name () {
+	local ver=$1
+	if [ -s /etc/dhcp/dhclient$ver-${DEVICE}.conf ]; then
+		DHCLIENTCONF="-cf /etc/dhcp/dhclient$ver-${DEVICE}.conf";
+	elif [ -s /etc/dhclient$ver-${DEVICE}.conf ]; then
+		DHCLIENTCONF="-cf /etc/dhclient$ver-${DEVICE}.conf";
+	else
+		DHCLIENTCONF='';
+	fi
+}
+
 need_config ()
 {
     local nconfig
-- 
cgit v1.2.1