diff options
| author | Bill Nottingham <notting@redhat.com> | 2011-03-30 15:02:59 -0400 |
|---|---|---|
| committer | Petr Lautrbach <plautrba@redhat.com> | 2011-08-15 10:00:34 +0200 |
| commit | 5dc99fe1052d8be9b9c0aff47bbff8cb858489d7 (patch) | |
| tree | c527d2649e570f090468028cc7ef2276d3a8c890 /sysconfig/network-scripts | |
| parent | 1f3ff6ad38dc6257bc9f05b79d9ef1b53122e07c (diff) | |
| download | initscripts-5dc99fe1052d8be9b9c0aff47bbff8cb858489d7.tar initscripts-5dc99fe1052d8be9b9c0aff47bbff8cb858489d7.tar.gz initscripts-5dc99fe1052d8be9b9c0aff47bbff8cb858489d7.tar.bz2 initscripts-5dc99fe1052d8be9b9c0aff47bbff8cb858489d7.tar.xz initscripts-5dc99fe1052d8be9b9c0aff47bbff8cb858489d7.zip | |
Don't explictly disallow IPv6 aliases (#583409, #612877.)
Resolved conflicts - used upstream version:
sysconfig/network-scripts/ifdown-ipv6
sysconfig/network-scripts/ifup-ipv6
Diffstat (limited to 'sysconfig/network-scripts')
| -rwxr-xr-x | sysconfig/network-scripts/ifdown-ipv6 | 5 | ||||
| -rwxr-xr-x | sysconfig/network-scripts/ifup-ipv6 | 5 |
2 files changed, 4 insertions, 6 deletions
diff --git a/sysconfig/network-scripts/ifdown-ipv6 b/sysconfig/network-scripts/ifdown-ipv6 index 9f04531a..fd653230 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=$(echo ${DEVICE} | sed 's/:.*//g') -[ "$DEVICE" != "$REALDEVICE" ] && exit 0 +REALDEVICE=${DEVICE%%:*} +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 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 |