aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLukas Nykryn <lnykryn@redhat.com>2013-07-29 15:17:48 +0200
committerLukas Nykryn <lnykryn@redhat.com>2013-08-19 14:11:00 +0200
commit28836ffca41162cdcabf518a280c31b641a0fab2 (patch)
treed7ce50a9a7e4fb6c1c1057e84cd2720b3fb7df73
parent975c5407b0125b27c6fe61520d1d348569f10b50 (diff)
downloadinitscripts-28836ffca41162cdcabf518a280c31b641a0fab2.tar
initscripts-28836ffca41162cdcabf518a280c31b641a0fab2.tar.gz
initscripts-28836ffca41162cdcabf518a280c31b641a0fab2.tar.bz2
initscripts-28836ffca41162cdcabf518a280c31b641a0fab2.tar.xz
initscripts-28836ffca41162cdcabf518a280c31b641a0fab2.zip
consider IPV6INIT undefined as YES
-rw-r--r--ppp/ipv6-up6
-rw-r--r--sysconfig.txt2
-rwxr-xr-xsysconfig/network-scripts/ifup-aliases2
-rwxr-xr-xsysconfig/network-scripts/ifup-eth2
-rwxr-xr-xsysconfig/network-scripts/ifup-ippp4
-rwxr-xr-xsysconfig/network-scripts/ifup-ipv64
-rwxr-xr-xsysconfig/network-scripts/ifup-sit6
7 files changed, 13 insertions, 13 deletions
diff --git a/ppp/ipv6-up b/ppp/ipv6-up
index 54219e43..059afec6 100644
--- a/ppp/ipv6-up
+++ b/ppp/ipv6-up
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
#
# ipv6-up
#
@@ -50,8 +50,8 @@ CONFIG=$LOGDEVICE
[ -f "$CONFIG" ] || CONFIG=ifcfg-$CONFIG
source_config
-# Test whether IPv6 configuration is enabled for this interface, else stop
-[ "$IPV6INIT" = "yes" ] || exit 0
+# Test whether IPv6 configuration is disabled for this interface
+[[ "$IPV6INIT" = [nN0]* ]] && exit 0
[ -f /etc/sysconfig/network-scripts/network-functions-ipv6 ] || exit 1
. /etc/sysconfig/network-scripts/network-functions-ipv6
diff --git a/sysconfig.txt b/sysconfig.txt
index 862bfe6d..bc7bfa37 100644
--- a/sysconfig.txt
+++ b/sysconfig.txt
@@ -599,7 +599,7 @@ Files in /etc/sysconfig/network-scripts/
IPv6-only items for real interfaces:
IPV6INIT=yes|no
Enable or disable IPv6 static, DHCP, or autoconf configuration for this interface
- Default: no
+ Default: yes
IPV6FORWARDING=yes|no
Enable or disable global forwarding of incoming IPv6 packets
Note: Obsolete in interface specification!
diff --git a/sysconfig/network-scripts/ifup-aliases b/sysconfig/network-scripts/ifup-aliases
index 8a59dd0a..9bc815f3 100755
--- a/sysconfig/network-scripts/ifup-aliases
+++ b/sysconfig/network-scripts/ifup-aliases
@@ -267,7 +267,7 @@ function new_interface ()
/sbin/ip addr add ${IPADDR}/${PREFIX} brd ${BROADCAST} dev ${parent_device} label ${DEVICE}
- [ "$IPV6INIT" = "yes" ] && /etc/sysconfig/network-scripts/ifup-ipv6 ${DEVICE}
+ [[ "$IPV6INIT" != [nN0]* ]] && /etc/sysconfig/network-scripts/ifup-ipv6 ${DEVICE}
if [ "$NO_ALIASROUTING" != yes ]; then
diff --git a/sysconfig/network-scripts/ifup-eth b/sysconfig/network-scripts/ifup-eth
index 910ac9b8..c8287d64 100755
--- a/sysconfig/network-scripts/ifup-eth
+++ b/sysconfig/network-scripts/ifup-eth
@@ -178,7 +178,7 @@ if [ -n "${DYNCONFIG}" ] && [ -x /sbin/dhclient ]; then
if [[ "${IPV4_FAILURE_FATAL}" = [Yy1]* ]] ; then
exit 1
fi
- if [[ "$IPV6INIT" != [yY1]* && "$DHCPV6C" != [yY1]* ]] ; then
+ if [[ "$IPV6INIT" = [nN0]* || "$DHCPV6C" != [yY1]* ]] ; then
exit 1
fi
net_log "Unable to obtain IPv4 DHCP address ${DEVICE}." warning
diff --git a/sysconfig/network-scripts/ifup-ippp b/sysconfig/network-scripts/ifup-ippp
index 3ba93328..8405c8d9 100755
--- a/sysconfig/network-scripts/ifup-ippp
+++ b/sysconfig/network-scripts/ifup-ippp
@@ -1,4 +1,4 @@
-#! /bin/sh
+#! /bin/bash
#
# ifup-ippp
#
@@ -368,7 +368,7 @@ function addprovider()
fi
# Setup IPv6
- if [ "$IPV6INIT" = "yes" -a ! -z "$IPV6ADDR" ]; then
+ if [[ "$IPV6INIT" != [nN0]* && ! -z "$IPV6ADDR" ]]; then
# Native IPv6 use of device configured, check of encapsulation required
if [ "$ENCAP" = "syncppp" ]; then
echo $"Warning: ipppd (kernel 2.4.x and below) doesn't support IPv6 using encapsulation 'syncppp'"
diff --git a/sysconfig/network-scripts/ifup-ipv6 b/sysconfig/network-scripts/ifup-ipv6
index 3309f0a4..31b3b64c 100755
--- a/sysconfig/network-scripts/ifup-ipv6
+++ b/sysconfig/network-scripts/ifup-ipv6
@@ -65,8 +65,8 @@ source_config
REALDEVICE=${DEVICE%%:*}
DEVICE=$REALDEVICE
-# Test whether IPv6 configuration is enabled for this interface, else stop
-[ "$IPV6INIT" = "yes" ] || exit 0
+# Test whether IPv6 configuration is disabled for this interface
+[[ "$IPV6INIT" = [nN0]* ]] && exit 0
[ -f /etc/sysconfig/network-scripts/network-functions-ipv6 ] || exit 1
. /etc/sysconfig/network-scripts/network-functions-ipv6
diff --git a/sysconfig/network-scripts/ifup-sit b/sysconfig/network-scripts/ifup-sit
index eb77fc4d..01c8756c 100755
--- a/sysconfig/network-scripts/ifup-sit
+++ b/sysconfig/network-scripts/ifup-sit
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
#
# ifup-sit
#
@@ -43,8 +43,8 @@ source_config
REALDEVICE=${DEVICE%%:*}
[ "$DEVICE" != "$REALDEVICE" ] && exit 0
-# Test whether IPv6 configuration is enabled for this interface, else stop
-[ "$IPV6INIT" = "yes" ] || exit 0
+# Test whether IPv6 configuration is disabled for this interface
+[[ "$IPV6INIT" = [nN0]* ]] && exit 0
[ -f /etc/sysconfig/network-scripts/network-functions-ipv6 ] || exit 1
. /etc/sysconfig/network-scripts/network-functions-ipv6