File 0004-Do-not-suggest-dropped-dhcp6c-client.patch of Package sysconfig.openSUSE_12.1_Update

From b4a890149ada6af9b506c9c46157d4446b71c04a Mon Sep 17 00:00:00 2001
From: Marius Tomaschewski <mt@suse.com>
Date: Mon, 5 Dec 2011 17:36:22 +0100
Subject: [PATCH] Do not suggest dropped dhcp6c client

Do not suggest dhcp6c client from dropped dhcpv6 package
in ifup-dhcp, marked dhcp6c as deprecated in network/dhcp
and changed to use dhclient6 as first choice (bnc#734723).

Signed-off-by: Marius Tomaschewski <mt@suse.com>
---
 config/sysconfig.dhcp-network |   13 ++++++++-----
 scripts/ifup-dhcp             |    8 ++++----
 2 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/config/sysconfig.dhcp-network b/config/sysconfig.dhcp-network
index 3a5c21e..17c9688 100644
--- a/config/sysconfig.dhcp-network
+++ b/config/sysconfig.dhcp-network
@@ -16,23 +16,26 @@
 # of these options -- NetworkManager is not using any sysconfig settings.
 #
 
-## Type:	string
+## Type:	list(dhcpcd,dhclient,)
 ## Default:	""
 ## ServiceRestart: network
 #
 # Which DHCPv4 client should be used? 
-# If empty, dhcpcd is tried, then dhclient 
-# Other possible values:
+# Currently the following client are supported:
 # 	dhcpcd   (DHCP client daemon)
 # 	dhclient (ISC dhclient)
+# If empty, dhcpcd is tried, then dhclient 
 DHCLIENT_BIN=""
 
-## Type:	string
+## Type:	list(dhclient6,)
 ## Default:	""
 ## ServiceRestart: network
 #
 # Which DHCPv6 client should be used? 
-# Currently only the dhcp6c client is supported.
+# Currently the following client are supported:
+#       dhclient6  (ISC dhcp 4.x client)
+#       dhcp6c     (dhcpv6 client -- deprecated, package dropped)
+# If empty, dhclient6 is tried, then dhcp6c
 #
 DHCLIENT6_BIN=""
 
diff --git a/scripts/ifup-dhcp b/scripts/ifup-dhcp
index 1052a16..8315f92 100755
--- a/scripts/ifup-dhcp
+++ b/scripts/ifup-dhcp
@@ -174,7 +174,7 @@ done
 DHCLIENT6=""
 for x in "$DHCLIENT6_BIN" \
 	 "/sbin/${DHCLIENT6_BIN##*/}" \
-	 "/sbin/dhcp6c" "/sbin/dhclient6" ;
+	 "/sbin/dhclient6" "/sbin/dhcp6c" ;
 do
 	if [ "x$x" != x -a "${x##/*}" != "$x" -a -x "$x" ] ; then
 		DHCLIENT6_BIN="$x"
@@ -255,14 +255,14 @@ case "$ACTION" in
 						print_mesg err_mesg \
 							"DHCP6 client ($DHCLIENT6_BIN) is not available."
 						print_mesg err_mesg \
-							"      Please install the 'dhcpv6' or 'dhcp-client' package"
+							"      Please install the 'dhcp-client' package"
 					fi
 				;;
 				"")
 					if [ "x$explicit_dhcp6" = "xyes" ] ; then
 						if [ "x$HAVE_IPv6" = xyes ] ; then
 							print_mesg err_mesg "DHCP6 client is not available."
-							print_mesg err_mesg "      Please install 'dhcpv6' or 'dhcp-client' package'"
+							print_mesg err_mesg "      Please install 'dhcp-client' package'"
 						else
 							print_mesg err_mesg "DHCP6 disabled - no IPv6 support"
 						fi
@@ -271,7 +271,7 @@ case "$ACTION" in
 				*)
 					DHCLIENT6=""
 					print_mesg err_mesg "DHCP6 client unknown/unsupported: $DHCLIENT6_BIN"
-					print_mesg err_mesg "      Please install the 'dhcpv6' or 'dhcp-client' package"
+					print_mesg err_mesg "      Please install the 'dhcp-client' package"
 				;;
 				esac
 			;;
-- 
1.7.7