aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBill Nottingham <notting@redhat.com>2011-03-30 15:02:59 -0400
committerBill Nottingham <notting@redhat.com>2011-03-30 15:02:59 -0400
commitd36934846ae17b0362a65b87ab51525b76619ae7 (patch)
treecd9d42e2dd2288305b4d77b0385216e7b3f4e3d0
parente922bebb5a023b7a627fa14d5a4d58e6a0cca527 (diff)
downloadinitscripts-d36934846ae17b0362a65b87ab51525b76619ae7.tar
initscripts-d36934846ae17b0362a65b87ab51525b76619ae7.tar.gz
initscripts-d36934846ae17b0362a65b87ab51525b76619ae7.tar.bz2
initscripts-d36934846ae17b0362a65b87ab51525b76619ae7.tar.xz
initscripts-d36934846ae17b0362a65b87ab51525b76619ae7.zip
Don't explictly disallow IPv6 aliases (#583409, #612877.)
-rwxr-xr-xsysconfig/network-scripts/ifdown-ipv63
-rwxr-xr-xsysconfig/network-scripts/ifup-ipv63
2 files changed, 2 insertions, 4 deletions
diff --git a/sysconfig/network-scripts/ifdown-ipv6 b/sysconfig/network-scripts/ifdown-ipv6
index 51c4028f..7bfcfb34 100755
--- a/sysconfig/network-scripts/ifdown-ipv6
+++ b/sysconfig/network-scripts/ifdown-ipv6
@@ -45,9 +45,8 @@ CONFIG=$1
[ -f "$CONFIG" ] || CONFIG=ifcfg-$CONFIG
source_config
-# IPv6 don't need aliases anymore, config is skipped
REALDEVICE=${DEVICE%%:*}
-[ "$DEVICE" != "$REALDEVICE" ] && exit 0
+DEVICE=$REALDEVICE
[ -f /etc/sysconfig/network-scripts/network-functions-ipv6 ] || exit 1
. /etc/sysconfig/network-scripts/network-functions-ipv6
diff --git a/sysconfig/network-scripts/ifup-ipv6 b/sysconfig/network-scripts/ifup-ipv6
index 478682fb..331073ad 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=${DEVICE%%:*}
-[ "$DEVICE" != "$REALDEVICE" ] && exit 0
+DEVICE=$REALDEVICE
# Test whether IPv6 configuration is enabled for this interface, else stop
[ "$IPV6INIT" = "yes" ] || exit 0