From 73d4520f2c852781fb8904bb3fc97cfed92b900992c2d0d6cebdde559f6b5e44 Mon Sep 17 00:00:00 2001
From: Marius Tomaschewski <mt@suse.com>
Date: Tue, 30 Nov 2010 21:53:03 +0000
Subject: [PATCH] Added missed DHCRELAY6_LOWER_INTERFACES_ARGS variable rename
 Initialized DHCRELAY[6_LOWER,6_UPPER]_INTERFACES_ARGS variables

OBS-URL: https://build.opensuse.org/package/show/network:dhcp/dhcp?expand=0&rev=46
---
 dhcp.spec    | 4 ++++
 rc.dhcrelay  | 1 +
 rc.dhcrelay6 | 2 ++
 3 files changed, 7 insertions(+)

diff --git a/dhcp.spec b/dhcp.spec
index a9d84c7..27929eb 100644
--- a/dhcp.spec
+++ b/dhcp.spec
@@ -379,6 +379,10 @@ exit 0
 %insserv_cleanup
 
 %post relay
+%{rename_sysconfig_variable -f etc/sysconfig/dhcrelay
+	DHCRELAY6_LOWER_INTERFACES_ARGS DHCRELAY6_LOWER_INTERFACES}
+%{rename_sysconfig_variable -f etc/sysconfig/dhcrelay
+	DHCRELAY6_UPPER_INTERFACES_ARGS DHCRELAY6_UPPER_INTERFACES}
 %{fillup_and_insserv  -n dhcrelay dhcrelay dhcrelay6}
 
 %preun relay
diff --git a/rc.dhcrelay b/rc.dhcrelay
index 40ee2e2..01f0100 100644
--- a/rc.dhcrelay
+++ b/rc.dhcrelay
@@ -93,6 +93,7 @@ case "$1" in
 		exit 6;
 	fi
 
+	DHCRELAY_INTERFACES_ARGS=''
 	for i in $DHCRELAY_INTERFACES ; do
 		DHCRELAY_INTERFACES_ARGS="$DHCRELAY_INTERFACES_ARGS -i $i"
 	done
diff --git a/rc.dhcrelay6 b/rc.dhcrelay6
index 15b137b..7d6964e 100644
--- a/rc.dhcrelay6
+++ b/rc.dhcrelay6
@@ -84,10 +84,12 @@ case "$1" in
 		echo -n "... already running"; rc_status -v; exit 0;
 	}
 
+	DHCRELAY6_LOWER_INTERFACES_ARGS=''
 	for l in $DHCRELAY6_LOWER_INTERFACES ; do
 		test "x$l" = x -o "x$l" = "x-l" && continue
 		DHCRELAY6_LOWER_INTERFACES_ARGS="$DHCRELAY6_LOWER_INTERFACES_ARGS -l $l"
 	done
+	DHCRELAY6_UPPER_INTERFACES_ARGS=''
 	for u in $DHCRELAY6_UPPER_INTERFACES ; do
 		test "x$u" = x -o "x$u" = "x-u" && continue
 		DHCRELAY6_UPPER_INTERFACES_ARGS="$DHCRELAY6_UPPER_INTERFACES_ARGS -u $u"