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

---
 sysconfig/network-scripts/ifdown-eth       | 12 +++++-------
 sysconfig/network-scripts/ifdown-ippp      |  4 +---
 sysconfig/network-scripts/ifdown-ipv6      |  6 ------
 sysconfig/network-scripts/ifdown-sit       |  6 ------
 sysconfig/network-scripts/ifup-eth         | 16 ++++++----------
 sysconfig/network-scripts/ifup-ippp        |  6 ++----
 sysconfig/network-scripts/ifup-ipv6        |  4 ----
 sysconfig/network-scripts/ifup-sit         |  4 ----
 sysconfig/network-scripts/init.ipv6-global |  4 ----
 9 files changed, 14 insertions(+), 48 deletions(-)

(limited to 'sysconfig/network-scripts')

diff --git a/sysconfig/network-scripts/ifdown-eth b/sysconfig/network-scripts/ifdown-eth
index c0de20e5..c987d346 100755
--- a/sysconfig/network-scripts/ifdown-eth
+++ b/sysconfig/network-scripts/ifdown-eth
@@ -60,13 +60,11 @@ if is_bonding_device ${DEVICE} ; then
 
 fi
 
-if [ "${NETWORKING_IPV6}" = "yes" ]; then
-    /etc/sysconfig/network-scripts/ifdown-ipv6 ${CONFIG}
-    if [[ "${DHCPV6C}" = [Yy1]* ]] && [ -f /var/run/dhcp6c_${DEVICE}.pid ]; then
-       kill `cat /var/run/dhcp6c_${DEVICE}.pid`;
-       rm -f /var/run/dhcp6c_${DEVICE}.pid;
-    fi;	
-fi;
+/etc/sysconfig/network-scripts/ifdown-ipv6 ${CONFIG}
+if [[ "${DHCPV6C}" = [Yy1]* ]] && [ -f /var/run/dhcp6c_${DEVICE}.pid ]; then
+	kill `cat /var/run/dhcp6c_${DEVICE}.pid`;
+	rm -f /var/run/dhcp6c_${DEVICE}.pid;
+fi
 
 retcode=0
 [ -n "`pidof -x dhclient`" ] && {
diff --git a/sysconfig/network-scripts/ifdown-ippp b/sysconfig/network-scripts/ifdown-ippp
index 07f11053..54847cd4 100755
--- a/sysconfig/network-scripts/ifdown-ippp
+++ b/sysconfig/network-scripts/ifdown-ippp
@@ -16,9 +16,7 @@ if [ -f /var/lock/subsys/ibod ] ; then
 fi
 
 # Shut down IPv6
-if [ "${NETWORKING_IPV6}" = "yes" ]; then
-    /etc/sysconfig/network-scripts/ifdown-ipv6 $CONFIG
-fi
+/etc/sysconfig/network-scripts/ifdown-ipv6 $CONFIG
 
 # shutdown isdn device
 isdnctrl hangup $DEVICE >/dev/null 2>&1
diff --git a/sysconfig/network-scripts/ifdown-ipv6 b/sysconfig/network-scripts/ifdown-ipv6
index 2872aa29..2d14b6b9 100755
--- a/sysconfig/network-scripts/ifdown-ipv6
+++ b/sysconfig/network-scripts/ifdown-ipv6
@@ -16,9 +16,6 @@
 # Note: if called as (like normally) by /etc/sysconfig/network-scripts/ifdown
 #        exit codes aren't handled by "ifdown"
 #
-# 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:
 #  DEVICE=<device>
 #  IPV6INIT=yes|no: controls IPv6 configuration for this interface
@@ -52,9 +49,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
-
 [ -f /etc/sysconfig/network-scripts/network-functions-ipv6 ] || exit 1
 . /etc/sysconfig/network-scripts/network-functions-ipv6
 
diff --git a/sysconfig/network-scripts/ifdown-sit b/sysconfig/network-scripts/ifdown-sit
index 89d26677..20be7fa0 100755
--- a/sysconfig/network-scripts/ifdown-sit
+++ b/sysconfig/network-scripts/ifdown-sit
@@ -13,9 +13,6 @@
 #
 # Version 2002-11-01
 #
-# 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:
 #  DEVICE=<device>
 #
@@ -34,9 +31,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
-
 [ -f /etc/sysconfig/network-scripts/network-functions-ipv6 ] || exit 1
 . /etc/sysconfig/network-scripts/network-functions-ipv6
 
diff --git a/sysconfig/network-scripts/ifup-eth b/sysconfig/network-scripts/ifup-eth
index 84500851..b9a00f13 100755
--- a/sysconfig/network-scripts/ifup-eth
+++ b/sysconfig/network-scripts/ifup-eth
@@ -203,9 +203,7 @@ else
 	 fi
 	 [ -n "${LINKDELAY}" ] && /bin/sleep ${LINKDELAY}
 
-	 if [ "${NETWORKING_IPV6}" = "yes" ]; then
-	    /etc/sysconfig/network-scripts/ifup-ipv6 ${CONFIG}
-	 fi
+	 /etc/sysconfig/network-scripts/ifup-ipv6 ${CONFIG}
 	 exec /etc/sysconfig/network-scripts/ifup-post ${CONFIG} ${2}
     fi
   
@@ -277,13 +275,11 @@ if [ -z "${NOZEROCONF}" -a "${ISALIAS}" = "no" -a "${REALDEVICE}" != "lo" ]; the
 fi
 
 # IPv6 initialisation?
-if [ "${NETWORKING_IPV6}" = "yes" ]; then
-    /etc/sysconfig/network-scripts/ifup-ipv6 ${CONFIG}
-    if [[ "${DHCPV6C}"  = [Yy1]* ]] && [ -x /sbin/dhcp6c ]; then
-	/sbin/dhcp6c ${DEVICE};
-        dhcp6_pid=(`/bin/ps -eo 'pid,args' | /bin/grep "dhcp6c ${DEVICE}" | egrep -v grep`);
-	echo ${dhcp6_pid[0]} > /var/run/dhcp6c_${DEVICE}.pid
-    fi;
+/etc/sysconfig/network-scripts/ifup-ipv6 ${CONFIG}
+if [[ "${DHCPV6C}"  = [Yy1]* ]] && [ -x /sbin/dhcp6c ]; then
+    /sbin/dhcp6c ${DEVICE};
+    dhcp6_pid=(`/bin/ps -eo 'pid,args' | /bin/grep "dhcp6c ${DEVICE}" | egrep -v grep`);
+    echo ${dhcp6_pid[0]} > /var/run/dhcp6c_${DEVICE}.pid
 fi
 
 if [ "${IPX}" = yes ]; then
diff --git a/sysconfig/network-scripts/ifup-ippp b/sysconfig/network-scripts/ifup-ippp
index e17f0b62..628f8b0a 100755
--- a/sysconfig/network-scripts/ifup-ippp
+++ b/sysconfig/network-scripts/ifup-ippp
@@ -368,17 +368,15 @@ function addprovider()
     fi
 
     # Setup IPv6
-    if [ "${NETWORKING_IPV6}" = "yes" ]; then
-        if [ "$IPV6INIT" = "yes" -a ! -z "$IPV6ADDR" ]; then
+    if [ "$IPV6INIT" = "yes" -a ! -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'"
             elif [ "$ENCAP" = "rawip" ]; then
 		echo $"Warning: link doesn't support IPv6 using encapsulation 'rawip'"
 	    fi
-        fi
-        /etc/sysconfig/network-scripts/ifup-ipv6 $CONFIG
     fi
+    /etc/sysconfig/network-scripts/ifup-ipv6 $CONFIG
 }
 
 addprovider || exit 1
diff --git a/sysconfig/network-scripts/ifup-ipv6 b/sysconfig/network-scripts/ifup-ipv6
index caadebb1..a50d1aa4 100755
--- a/sysconfig/network-scripts/ifup-ipv6
+++ b/sysconfig/network-scripts/ifup-ipv6
@@ -17,7 +17,6 @@
 #        exit codes aren't handled by "ifup"
 #
 # Uses following information from "/etc/sysconfig/network":
-#  NETWORKING_IPV6=yes|no: controls IPv6 initialization (global setting)
 #  IPV6_DEFAULTDEV=<device>: controls default route (optional)
 #  IPV6_DEFAULTGW=<address>: controls default route (optional)
 #
@@ -70,9 +69,6 @@ REALDEVICE=`echo ${DEVICE} | sed 's/:.*//g'`
 # 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
 
diff --git a/sysconfig/network-scripts/ifup-sit b/sysconfig/network-scripts/ifup-sit
index 33f2553a..b3206297 100755
--- a/sysconfig/network-scripts/ifup-sit
+++ b/sysconfig/network-scripts/ifup-sit
@@ -14,7 +14,6 @@
 # Version: 2003-09-08
 #
 # Uses following information from /etc/sysconfig/network:
-#  NETWORKING_IPV6=yes|no: controls IPv6 initialization (global setting)
 #  IPV6_DEFAULTDEV=<device>: controls default route (optional)
 #  IPV6_DEFAULTGW=<address>: controls default route (optional)
 #
@@ -47,9 +46,6 @@ REALDEVICE=`echo ${DEVICE} | sed 's/:.*//g'`
 # 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
 
diff --git a/sysconfig/network-scripts/init.ipv6-global b/sysconfig/network-scripts/init.ipv6-global
index 0f332d66..65897b21 100755
--- a/sysconfig/network-scripts/init.ipv6-global
+++ b/sysconfig/network-scripts/init.ipv6-global
@@ -20,7 +20,6 @@
 # Called by hooks from /etc/[rc.d/]init.d/network
 #
 # Uses following information from /etc/sysconfig/network:
-#  NETWORKING_IPV6=yes|no: controls global IPv6 initialization (default: no)
 #  IPV6FORWARDING=yes|no: controls global IPv6 forwarding (default: no)
 #  IPV6_AUTOCONF=yes|no: controls global automatic IPv6 configuration
 #   (default: yes if IPV6FORWARDING=no, no if IPV6FORWARDING=yes)
@@ -40,9 +39,6 @@ cd /etc/sysconfig/network-scripts
 ACTION="$1"
 POSITION="$2"
 
-# 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