ipx support returns (#51787)r6-20

3 files changed, 53 insertions, 5 deletions

diff --git a/sysconfig.txt b/sysconfig.txt
index 67fea335..7950e2e7 100644
--- a/sysconfig.txt
+++ b/sysconfig.txt
@@ -141,6 +141,8 @@ Files in /etc/sysconfig
 
   All IPv6 options can be overridden in interface-specific configuration.
 
+  All the IPX stuff is optional, and should default to off.
+
   obsoleted values from earlier releases:
 
     FORWARD_IPV4=yes|no
@@ -153,11 +155,6 @@ Files in /etc/sysconfig
       a bad idea otherwise. This setting was moved into
       net.ipv4.ip_always_defrag setting in /etc/sysctl.conf. It
       is no longer valid for 2.4 kernels.
-    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>
 
 /etc/sysconfig/static-routes:
 
@@ -502,6 +499,9 @@ Files in /etc/sysconfig/network-scripts/
      local IPv6 address of a numbered tunnel
 
   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 ifconfig, for use with the
       ethertap device)
     PROMISC=yes|no (enable or disable promiscuous mode)
diff --git a/sysconfig/network-scripts/ifup b/sysconfig/network-scripts/ifup
index aec95481..81f16d33 100755
--- a/sysconfig/network-scripts/ifup
+++ b/sysconfig/network-scripts/ifup
@@ -242,5 +242,9 @@ if [ "${NETWORKING_IPV6}" = "yes" ]; then
     /etc/sysconfig/network-scripts/ifup-ipv6 ${CONFIG}
 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
new file mode 100755
index 00000000..4d03d833
--- /dev/null
+++ b/sysconfig/network-scripts/ifup-ipx
@@ -0,0 +1,44 @@
+#!/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
+
+if [ ! -x /sbin/ipx_interface ] ; then
+	# cannot configure IPX with non-existant utilities
+	exit 0
+fi
+
+. /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=$(echo $frametype | sed 's/\./_/')
+    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
+