aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBill Nottingham <notting@redhat.com>2011-03-30 15:02:59 -0400
committerHarald Hoyer <harald@redhat.com>2011-04-19 15:31:14 +0200
commitebcb903f543f97732218a816a45a250b6529dfbd (patch)
tree0782468ece1452e8c48a7897bbe2a37225d539b4
parent6e42b705b9ed7cf4532d6adb5ca26b1c3ae3aa73 (diff)
downloadinitscripts-ebcb903f543f97732218a816a45a250b6529dfbd.tar
initscripts-ebcb903f543f97732218a816a45a250b6529dfbd.tar.gz
initscripts-ebcb903f543f97732218a816a45a250b6529dfbd.tar.bz2
initscripts-ebcb903f543f97732218a816a45a250b6529dfbd.tar.xz
initscripts-ebcb903f543f97732218a816a45a250b6529dfbd.zip
Don't explictly disallow IPv6 aliases (#583409, #612877.)
https://bugzilla.redhat.com/show_bug.cgi?id=612877
-rwxr-xr-xsysconfig/network-scripts/ifdown-ipv65
-rwxr-xr-xsysconfig/network-scripts/ifup-ipv65
2 files changed, 4 insertions, 6 deletions
diff --git a/sysconfig/network-scripts/ifdown-ipv6 b/sysconfig/network-scripts/ifdown-ipv6
index 2872aa29..c73b65c2 100755
--- a/sysconfig/network-scripts/ifdown-ipv6
+++ b/sysconfig/network-scripts/ifdown-ipv6
@@ -48,9 +48,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 should be configured, else stop
[ "${NETWORKING_IPV6}" = "yes" ] || exit 0
diff --git a/sysconfig/network-scripts/ifup-ipv6 b/sysconfig/network-scripts/ifup-ipv6
index caadebb1..1dc14560 100755
--- a/sysconfig/network-scripts/ifup-ipv6
+++ b/sysconfig/network-scripts/ifup-ipv6
@@ -63,9 +63,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