From 5dc99fe1052d8be9b9c0aff47bbff8cb858489d7 Mon Sep 17 00:00:00 2001
From: Bill Nottingham <notting@redhat.com>
Date: Wed, 30 Mar 2011 15:02:59 -0400
Subject: Don't explictly disallow IPv6 aliases (#583409, #612877.)

Resolved conflicts - used upstream version:

	sysconfig/network-scripts/ifdown-ipv6
	sysconfig/network-scripts/ifup-ipv6
---
 sysconfig/network-scripts/ifup-ipv6 | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'sysconfig/network-scripts/ifup-ipv6')

diff --git a/sysconfig/network-scripts/ifup-ipv6 b/sysconfig/network-scripts/ifup-ipv6
index 2d9217e3..78f304bf 100755
--- a/sysconfig/network-scripts/ifup-ipv6
+++ b/sysconfig/network-scripts/ifup-ipv6
@@ -62,9 +62,8 @@ CONFIG=$1
 [ -f "$CONFIG" ] || CONFIG=ifcfg-$CONFIG
 source_config
 
-# IPv6 don't need aliases anymore, config is skipped
-REALDEVICE=$(echo ${DEVICE} | sed 's/:.*//g')
-[ "$DEVICE" != "$REALDEVICE" ] && exit 0
+REALDEVICE=${DEVICE%%:*}
+DEVICE=$REALDEVICE
 
 # Test whether IPv6 configuration is enabled for this interface, else stop
 [ "$IPV6INIT" = "yes" ] || exit 0
-- 
cgit v1.2.1