From aed2a69bd1be1ce04804b5bf934c589f5815bed2 Mon Sep 17 00:00:00 2001
From: Bill Nottingham <notting@redhat.com>
Date: Thu, 10 Dec 2009 15:58:57 -0500
Subject: Delete IPX support.

Conflicts:
	rc.d/init.d/network
	sysconfig.txt
	sysconfig/network-scripts/ifup-ipx
---
 rc.d/init.d/network                | 20 -------------------
 sysconfig.txt                      | 10 ----------
 sysconfig/network-scripts/ifup-eth |  4 ----
 sysconfig/network-scripts/ifup-ipx | 41 --------------------------------------
 4 files changed, 75 deletions(-)
 delete mode 100755 sysconfig/network-scripts/ifup-ipx

diff --git a/rc.d/init.d/network b/rc.d/init.d/network
index a314d9d2..129042f9 100755
--- a/rc.d/init.d/network
+++ b/rc.d/init.d/network
@@ -33,8 +33,6 @@ fi
 # if the ip configuration utility isn't around we can't function.
 [ -x /sbin/ip ] || exit 1
 
-# Even if IPX is configured, without the utilities we can't do much
-[ ! -x /sbin/ipx_internal_net ] || [ ! -x /sbin/ipx_configure ] && IPX=
 
 CWD=$(pwd)
 cd /etc/sysconfig/network-scripts
@@ -66,16 +64,6 @@ case "$1" in
 	# bring up loopback interface
 	action $"Bringing up loopback interface: " ./ifup ifcfg-lo
 
-	case "$IPX" in
-	  yes|true)
-	    /sbin/ipx_configure --auto_primary=$IPXAUTOPRIMARY \
-				   --auto_interface=$IPXAUTOFRAME
-	    if [ "$IPXINTERNALNETNUM" != "0" ]; then
-	       /sbin/ipx_internal_net add $IPXINTERNALNETNUM $IPXINTERNALNODENUM
-	    fi
-	    ;;
-	esac
-
 	case "$VLAN" in
 	  yes)
 	    if [ ! -d /proc/net/vlan ] && ! modprobe 8021q >/dev/null 2>&1 ; then
@@ -226,14 +214,6 @@ case "$1" in
 		)
 	done
 
-	case "$IPX" in
-	  yes|true)
-	    if [ "$IPXINTERNALNETNUM" != "0" ]; then
-	       /sbin/ipx_internal_net del
-	    fi
-	    ;;
-	esac
-
 	action $"Shutting down loopback interface: " ./ifdown ifcfg-lo
 
 	sysctl -w net.ipv4.ip_forward=0 > /dev/null 2>&1
diff --git a/sysconfig.txt b/sysconfig.txt
index 73e7a1ca..e34ca1b9 100644
--- a/sysconfig.txt
+++ b/sysconfig.txt
@@ -170,16 +170,9 @@ Generic options:
   GATEWAY=<gateway IP>
   GATEWAYDEV=<gateway device to use, when multiple devices have GATEWAY=> (e.g. eth0)
   NISDOMAIN=<nis domain name>
-  IPX=yes|no
-  IPXAUTOPRIMARY=on|off (note, that MUST be on|off, not yes|no)
-  IPXAUTOFRAME=on|off (again, not yes|no)
-  IPXINTERNALNETNUM=<netnum>
-  IPXINTERNALNODENUM=<nodenum>
   NOZEROCONF=
     Set this to not set a route for dynamic link-local addresses.
 
-  All the IPX stuff is optional, and should default to off.
-
   NETWORKDELAY=<delay in seconds>
     Delay in seconds after all network interfaces are initialized.  Useful if
     network has spanning tree running and must wait for STP convergence.
@@ -691,9 +684,6 @@ Files in /etc/sysconfig/network-scripts/
       only, not IPv6 addresses.
 
   Ethernet-only items:
-    {IPXNETNUM,IPXPRIMARY,IPXACTIVE}_{802_2,802_3,ETHERII,SNAP}
-    configuration matrix for IPX.  Only used if IPX is active.
-    Managed from /etc/sysconfig/network-scripts/ifup-ipx
     ARP=yes|no (adds 'arp' flag to ip, for use with the
       ethertap device)
     LINKDELAY=<time in seconds>
diff --git a/sysconfig/network-scripts/ifup-eth b/sysconfig/network-scripts/ifup-eth
index 8be5bff1..0606231a 100755
--- a/sysconfig/network-scripts/ifup-eth
+++ b/sysconfig/network-scripts/ifup-eth
@@ -297,9 +297,5 @@ if [[ "${DHCPV6C}"  = [Yy1]* ]] && [ -x /sbin/dhclient ]; then
     fi
 fi
 
-if [ "${IPX}" = yes ]; then
-       /etc/sysconfig/network-scripts/ifup-ipx ${DEVICE}
-fi
-
 exec /etc/sysconfig/network-scripts/ifup-post ${CONFIG} ${2}
 
diff --git a/sysconfig/network-scripts/ifup-ipx b/sysconfig/network-scripts/ifup-ipx
deleted file mode 100755
index dbd294a8..00000000
--- a/sysconfig/network-scripts/ifup-ipx
+++ /dev/null
@@ -1,41 +0,0 @@
-#!/bin/bash
-# configures IPX on $1 if appropriate
-
-PATH=/sbin:/usr/sbin:/bin:/usr/bin
-
-if [ "$1" = "" ]; then
-	echo $"usage: $0 <net-device>"
-	exit 1
-fi
-
-# cannot configure IPX with non-existent utilities
-[ -x /sbin/ipx_interface ] || exit 0
-
-. /etc/sysconfig/network
-
-case $IPX in yes|true) ;; *) exit 0 ;; esac
-
-cd /etc/sysconfig/network-scripts
-. ./network-functions
-
-CONFIG=$1
-[ -f "$CONFIG" ] || CONFIG=ifcfg-$CONFIG
-source_config
-
-for frametype in 802.2 802.3 ETHERII SNAP ; do
-    framename=${frametype/./_}
-    eval ACT=\$IPXACTIVE_$framename
-    case $ACT in
-	yes|true)
-		eval PRIM=\$IPXPRIMARY_$framename
-		case $PRIM in
-		    yes|true) primary=-p ;;
-		    *) primary= ;;
-		esac
-		eval NUM=\$IPXNETNUM_$framename
-		/sbin/ipx_interface add $primary $1 $frametype $NUM
-		;;
-    esac
-done
-
-exit 0
-- 
cgit v1.2.1