From 0721d2cefd672da45402d6d558384e52a4ed8376 Mon Sep 17 00:00:00 2001
From: Lukas Nykryn <lnykryn@redhat.com>
Date: Mon, 29 Jul 2013 15:17:48 +0200
Subject: consider IPV6INIT undefined as YES

---
 sysconfig/network-scripts/ifup-aliases | 2 +-
 sysconfig/network-scripts/ifup-eth     | 2 +-
 sysconfig/network-scripts/ifup-ippp    | 4 ++--
 sysconfig/network-scripts/ifup-ipv6    | 4 ++--
 sysconfig/network-scripts/ifup-sit     | 6 +++---
 5 files changed, 9 insertions(+), 9 deletions(-)

(limited to 'sysconfig/network-scripts')

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
-- 
cgit v1.2.1