From e66cc4f3100d6e47aebf6202525a5ce6c0d394d4 Mon Sep 17 00:00:00 2001
From: Bill Nottingham <notting@redhat.com>
Date: Thu, 7 Feb 2002 03:10:56 +0000
Subject: - fix bug in setting netmask on s390/s390x (bug #55421)   nmbd daemon
 works now ;-) - missing parameter (S/390)

---
 sysconfig/network-scripts/ifup-ctc   | 6 +++---
 sysconfig/network-scripts/ifup-escon | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/sysconfig/network-scripts/ifup-ctc b/sysconfig/network-scripts/ifup-ctc
index 56cb490e..1cfa4970 100755
--- a/sysconfig/network-scripts/ifup-ctc
+++ b/sysconfig/network-scripts/ifup-ctc
@@ -24,12 +24,12 @@ then
 fi
 [ -n "${MTU}" ] && opts="${opts} mtu ${MTU}"
 
-ifconfig ${DEVICE} ${IPADDR} ${opts} pointopoint ${REMIP}
+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 ${REMIP} &>/dev/null; do
+while ! ping -w 30 -c 1 ${REMIP} &>/dev/null; do
 	timeout=$(($timeout + 1))
 	if [ $timeout = 20 ]; then
 		echo $"ERROR: ${DEVICE} did not come up!"
@@ -38,7 +38,7 @@ while ! ping -w 30 -c ${REMIP} &>/dev/null; do
 done
 
 if [ "${NETWORK}" != "" ] ; then
-	route add -net ${NETWORK} netmask ${NETMASK} ${DEVICE}
+	route add -host ${REMIP} metric 1 ${DEVICE}
 fi
 
 . /etc/sysconfig/network
diff --git a/sysconfig/network-scripts/ifup-escon b/sysconfig/network-scripts/ifup-escon
index f8cfc101..311aeb4b 100644
--- a/sysconfig/network-scripts/ifup-escon
+++ b/sysconfig/network-scripts/ifup-escon
@@ -25,12 +25,12 @@ then
 fi
 [ -n "${MTU}" ] && opts="${opts} mtu ${MTU}"
 
-ifconfig ${DEVICE} ${IPADDR} ${opts} pointopoint ${REMIP}
+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 ${REMIP} &>/dev/null; do
+while ! ping -w 30 -c 1 ${REMIP} &>/dev/null; do
 	timeout=$(($timeout + 1))
 	if [ $timeout = 20 ]; then
 		echo $"ERROR: ${DEVICE} did not come up!"
@@ -39,7 +39,7 @@ while ! ping -w 30 -c ${REMIP} &>/dev/null; do
 done
 
 if [ "${NETWORK}" != "" ] ; then
-	route add -net ${NETWORK} netmask ${NETMASK} ${DEVICE}
+	route add -host ${REMIP} metric 1 ${DEVICE}
 fi
 
 . /etc/sysconfig/network
-- 
cgit v1.2.1