From adcc4226f5be5723c56a953eb5e81b295f471686 Mon Sep 17 00:00:00 2001
From: Bill Nottingham <notting@redhat.com>
Date: Wed, 17 Jan 2007 19:41:50 +0000
Subject: remove NETWORKING_IPV6

---
 ppp/ip-down.ipv6to4 | 6 ------
 ppp/ip-up.ipv6to4   | 6 ------
 ppp/ipv6-down       | 6 ------
 ppp/ipv6-up         | 4 ----
 4 files changed, 22 deletions(-)

(limited to 'ppp')

diff --git a/ppp/ip-down.ipv6to4 b/ppp/ip-down.ipv6to4
index 1fe3e086..93e0d91d 100644
--- a/ppp/ip-down.ipv6to4
+++ b/ppp/ip-down.ipv6to4
@@ -21,9 +21,6 @@
 #        was set before by using "ip-up.ipv6to4" comparing IPv4 address
 #        of device with the generated 6to4 prefix
 #
-# Uses following information from /etc/sysconfig/network:
-#  NETWORKING_IPV6=yes|no: controls IPv6 initialization (global setting)
-#
 # Uses following information from /etc/sysconfig/network-scripts/ifcfg-$1:
 #  IPV6TO4INIT=yes|no: controls configuration
 #  IPV6TO4_ROUTING="<device>-<suffix>/<prefix length> ...": information to setup additional interfaces
@@ -54,9 +51,6 @@ source_config
 REALDEVICE=`echo ${DEVICE} | sed 's/:.*//g'`
 [ "$DEVICE" != "$REALDEVICE" ] && exit 0
 
-# Test whether IPv6 should be configured, else stop
-[ "$NETWORKING_IPV6" = "yes" ] || exit 0
-
 if [ ! -f /etc/sysconfig/network-scripts/network-functions-ipv6 ]; then
 	exit 1
 fi
diff --git a/ppp/ip-up.ipv6to4 b/ppp/ip-up.ipv6to4
index 0491ce7e..e06cc246 100644
--- a/ppp/ip-up.ipv6to4
+++ b/ppp/ip-up.ipv6to4
@@ -20,9 +20,6 @@
 # Note: this script will *kill* older still existing 6to4 tunnels regardless
 #        whether they were set before by another device
 #
-# Uses following information from /etc/sysconfig/network:
-#  NETWORKING_IPV6=yes|no: controls IPv6 initialization (global setting)
-#
 # Uses following information from /etc/sysconfig/network-scripts/ifcfg-$1:
 #  IPV6TO4INIT=yes|no: controls configuration
 #  IPV6TO4_IPV4ADDR=<IPv4 address>: special local address for 6to4 tunneling (only needed behind a NAT gateway)
@@ -60,9 +57,6 @@ source_config
 REALDEVICE=`echo ${DEVICE} | sed 's/:.*//g'`
 [ "$DEVICE" != "$REALDEVICE" ] && exit 0
 
-# Test whether IPv6 should be configured, else stop
-[ "$NETWORKING_IPV6" = "yes" ] || exit 0
-
 if [ ! -f /etc/sysconfig/network-scripts/network-functions-ipv6 ]; then
         exit 1
 fi
diff --git a/ppp/ipv6-down b/ppp/ipv6-down
index bc960483..b290585a 100644
--- a/ppp/ipv6-down
+++ b/ppp/ipv6-down
@@ -22,9 +22,6 @@
 #
 # Version 2006-08-02
 #
-# Uses following information from /etc/sysconfig/network:
-#  NETWORKING_IPV6=yes|no: controls IPv6 initialization (global setting)
-#
 # Uses following information from /etc/sysconfig/network-scripts/ifcfg-$1:
 #  IPV6INIT=yes|no: controls IPv6 configuration for this interface
 #
@@ -46,9 +43,6 @@ CONFIG=$LOGDEVICE
 [ -f "$CONFIG" ] || CONFIG=ifcfg-$CONFIG
 source_config
 
-# Test whether IPv6 should be configured, else stop
-[ "${NETWORKING_IPV6}" = "yes" ] || exit 0
-
 [ -f /etc/sysconfig/network-scripts/network-functions-ipv6 ] || exit 1
 . /etc/sysconfig/network-scripts/network-functions-ipv6
 
diff --git a/ppp/ipv6-up b/ppp/ipv6-up
index 2fe075d9..92588b98 100644
--- a/ppp/ipv6-up
+++ b/ppp/ipv6-up
@@ -23,7 +23,6 @@
 # Version: 2006-08-02
 #
 # Uses following information from "/etc/sysconfig/network":
-#  NETWORKING_IPV6=yes|no: controls IPv6 initialization (global setting)
 #  IPV6_DEFAULTDEV=<device>: controls default route (optional)
 #
 # Uses following information from "/etc/sysconfig/network-scripts/ifcfg-$1":
@@ -54,9 +53,6 @@ source_config
 # Test whether IPv6 configuration is enabled for this interface, else stop
 [ "$IPV6INIT" = "yes" ] || exit 0
 
-# Test whether IPv6 should be configured, else stop
-[ "${NETWORKING_IPV6}" = "yes" ] || exit 0
-
 [ -f /etc/sysconfig/network-scripts/network-functions-ipv6 ] || exit 1
 . /etc/sysconfig/network-scripts/network-functions-ipv6
 
-- 
cgit v1.2.1