From 9987361e94ec6f26e557053b27af6e43a9ee13e1 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/network-functions | 11 +++++++++++
 1 file changed, 11 insertions(+)

(limited to 'sysconfig/network-scripts/network-functions')

diff --git a/sysconfig/network-scripts/network-functions b/sysconfig/network-scripts/network-functions
index e0d5018c..a3833463 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