2 files changed, 1 insertions, 60 deletions
diff --git a/sysconfig/network-scripts/ifup-escon b/sysconfig/network-scripts/ifup-escon
deleted file mode 100644
index d2b0470c..00000000
--- a/sysconfig/network-scripts/ifup-escon
+++ /dev/null
@@ -1,53 +0,0 @@
-#!/bin/bash
-#
-# /etc/sysconfig/network-scripts/ifup-escon
-#
-# the escon network interface is a point-to-point interface on S/390 machines
-# which uses the ctc module.
-#
-# To get the ctc module to load automatically at boot, you will need to
-# add the following line to /etc/modprobe.conf:
-#
-# alias escon0 ctc
-#
-
-cd /etc/sysconfig/network-scripts
-. network-functions
-
-CONFIG=$1
-[ -f "$CONFIG" ] || CONFIG=ifcfg-$CONFIG
-source_config
-
-if [ "$2" = "boot" -a "${ONBOOT}" = "no" ]
-then
-	exit
-fi
-[ -n "${MTU}" ] && opts="${opts} mtu ${MTU}"
-
-ifconfig ${DEVICE} ${IPADDR} ${opts} pointopoint ${REMIP} netmask ${NETMASK}
-
-# Wait for the device to come up - the chandev'ified ctc driver can take
-# quite a while...
-timeout=0
-while ! ping -w 30 -c 1 ${REMIP} &>/dev/null; do
-	timeout=$(($timeout + 1))
-	if [ $timeout = 20 ]; then
-		echo $"ERROR: ${DEVICE} did not come up!"
-		break
-	fi
-done
-
-if [ "${NETWORK}" != "" ] ; then
-	route add -host ${REMIP} metric 1 ${DEVICE}
-fi
-
-. /etc/sysconfig/network
-
-if [ "${GATEWAY}" != "" ]; then
-	if [ "${GATEWAYDEV}" = "" -o "${GATEWAYDEV}" = "${DEVICE}" ]; then
-		# set up default gateway
-		route add default gw ${GATEWAY}
-	fi
-fi
-
-/etc/sysconfig/network-scripts/ifup-post $1
diff --git a/sysconfig/network-scripts/network-functions b/sysconfig/network-scripts/network-functions
index 5724e9ba..8d14a780 100644
--- a/sysconfig/network-scripts/network-functions
+++ b/sysconfig/network-scripts/network-functions
@@ -77,12 +77,6 @@ source_config ()
 	IUCV)
 		DEVICETYPE="iucv"
 		;;
-	ESCON)
-		DEVICETYPE="escon"
-		;;
-	QETH)
-		DEVICETYPE="eth"
-		;;
 
     esac
     [ -z "$DEVICETYPE" ] && DEVICETYPE=`echo ${DEVICE} | sed "s/[0-9]*$//"`
@@ -341,7 +335,7 @@ configure_ccwgroup_device ()
     if [ "$TYPE" = "QETH" ]; then
          DIR="/sys/bus/ccwgroup/drivers/qeth"
     elif
-       [ "$TYPE" = "CTC" -o "$TYPE" = "ESCON" ]; then
+       [ "$TYPE" = "CTC" ]; then
          DIR="/sys/bus/ccwgroup/drivers/ctc"
     elif
        [ "$TYPE" = "LCS" ]; then