aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBill Nottingham <notting@redhat.com>2009-12-10 15:58:57 -0500
committerBill Nottingham <notting@redhat.com>2009-12-10 15:58:57 -0500
commit1491819035155061011e3a5df9f8977425b1940c (patch)
tree091a49100730a3f1852d9315cc12f3266804ec3c
parentdb385525fbe5d60f1177cdc6a4f50825166ee1a3 (diff)
downloadinitscripts-1491819035155061011e3a5df9f8977425b1940c.tar
initscripts-1491819035155061011e3a5df9f8977425b1940c.tar.gz
initscripts-1491819035155061011e3a5df9f8977425b1940c.tar.bz2
initscripts-1491819035155061011e3a5df9f8977425b1940c.tar.xz
initscripts-1491819035155061011e3a5df9f8977425b1940c.zip
Delete IPX support.
-rwxr-xr-xrc.d/init.d/network21
-rw-r--r--sysconfig.txt10
-rwxr-xr-xsysconfig/network-scripts/ifup-eth4
-rwxr-xr-xsysconfig/network-scripts/ifup-ipx41
4 files changed, 0 insertions, 76 deletions
diff --git a/rc.d/init.d/network b/rc.d/init.d/network
index 0eb00e6b..28c6c905 100755
--- a/rc.d/init.d/network
+++ b/rc.d/init.d/network
@@ -33,9 +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 -o ! -x /sbin/ipx_configure ] && IPX=
-
# Even if VLAN is configured, without the utility we can't do much
[ ! -x /sbin/vconfig ] && VLAN=
@@ -69,16 +66,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
@@ -248,14 +235,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
if [ -d /proc/sys/net/ipv4 ]; then
diff --git a/sysconfig.txt b/sysconfig.txt
index 81610a35..d6c52bb1 100644
--- a/sysconfig.txt
+++ b/sysconfig.txt
@@ -190,16 +190,9 @@ Generic options:
GATEWAYDEV=<gateway device to use, when multiple devices have GATEWAY=> (e.g. eth0)
NISDOMAIN=<nis domain name>
VLAN=yes|no
- 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.
@@ -686,9 +679,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 ifconfig, 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 ba7dc8fc..45c6909b 100755
--- a/sysconfig/network-scripts/ifup-eth
+++ b/sysconfig/network-scripts/ifup-eth
@@ -310,9 +310,5 @@ if [[ "${DHCPV6C}" = [Yy1]* ]] && [ -x /sbin/dhcp6c ]; then
[ -n "$dhcp6_pid" ] && echo ${dhcp6_pid[0]} > /var/run/dhcp6c_${DEVICE}.pid
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 a5693cfe..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=$(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