diff options
| author | Karsten Hopp <karsten@redhat.com> | 2004-08-26 15:04:43 +0000 |
|---|---|---|
| committer | Karsten Hopp <karsten@redhat.com> | 2004-08-26 15:04:43 +0000 |
| commit | b96eba57390d90ffb29de1a9229c71b3a9ed90e5 (patch) | |
| tree | 06903b6edf06c5bba6194ac663580c99600e3c6e | |
| parent | 6e3d6ab7410829763f6826e05d2e50f1a5055059 (diff) | |
| download | initscripts-b96eba57390d90ffb29de1a9229c71b3a9ed90e5.tar initscripts-b96eba57390d90ffb29de1a9229c71b3a9ed90e5.tar.gz initscripts-b96eba57390d90ffb29de1a9229c71b3a9ed90e5.tar.bz2 initscripts-b96eba57390d90ffb29de1a9229c71b3a9ed90e5.tar.xz initscripts-b96eba57390d90ffb29de1a9229c71b3a9ed90e5.zip | |
- ifcfg-iucv/ctc: drop REMIP and use GATEWAY instead
| -rw-r--r-- | initscripts.spec | 5 | ||||
| -rwxr-xr-x | sysconfig/network-scripts/ifup-ctc | 10 | ||||
| -rwxr-xr-x | sysconfig/network-scripts/ifup-iucv | 7 |
3 files changed, 13 insertions, 9 deletions
diff --git a/initscripts.spec b/initscripts.spec index 4baed176..ec9f7c6e 100644 --- a/initscripts.spec +++ b/initscripts.spec @@ -1,6 +1,6 @@ Summary: The inittab file and the /etc/init.d scripts. Name: initscripts -Version: 7.70 +Version: 7.71 License: GPL Group: System Environment/Base Release: 1 @@ -252,6 +252,9 @@ rm -rf $RPM_BUILD_ROOT %ghost %attr(0664,root,utmp) /var/run/utmp %changelog +* Thu Aug 26 2004 Karsten Hopp <karsten@redhat.de> 7.71-1 +- ifcfg-iucv/ctc: drop REMIP and use GATEWAY instead + * Thu Aug 26 2004 Bill Nottingham <notting@redhat.com> 7.70-1 - autoload hardware modules on startup - minor fsck cleanup (#115028, <leonard-rh-bugzilla@den.ottolander.nl>) diff --git a/sysconfig/network-scripts/ifup-ctc b/sysconfig/network-scripts/ifup-ctc index b9b38196..beead387 100755 --- a/sysconfig/network-scripts/ifup-ctc +++ b/sysconfig/network-scripts/ifup-ctc @@ -25,12 +25,14 @@ fi configure_ccwgroup_device -ifconfig ${DEVICE} ${IPADDR} ${opts} pointopoint ${REMIP} netmask ${NETMASK} +. /etc/sysconfig/network + +ifconfig ${DEVICE} ${IPADDR} ${opts} pointopoint ${GATEWAY} 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 +while ! ping -w 30 -c 1 ${GATEWAY} &>/dev/null; do timeout=$(($timeout + 1)) if [ $timeout = 20 ]; then echo $"ERROR: ${DEVICE} did not come up!" @@ -39,11 +41,9 @@ while ! ping -w 30 -c 1 ${REMIP} &>/dev/null; do done if [ "${NETWORK}" != "" ] ; then - route add -host ${REMIP} metric 1 ${DEVICE} + route add -host ${GATEWAY} metric 1 ${DEVICE} fi -. /etc/sysconfig/network - if [ "${GATEWAY}" != "" ]; then if [ "${GATEWAYDEV}" = "" -o "${GATEWAYDEV}" = "${DEVICE}" ]; then # set up default gateway diff --git a/sysconfig/network-scripts/ifup-iucv b/sysconfig/network-scripts/ifup-iucv index d169de48..c4ce80b9 100755 --- a/sysconfig/network-scripts/ifup-iucv +++ b/sysconfig/network-scripts/ifup-iucv @@ -25,12 +25,13 @@ fi echo "$PEERID" > /sys/bus/iucv/drivers/netiucv/connection 2>/dev/null -ifconfig ${DEVICE} ${IPADDR} ${opts} pointopoint ${REMIP} netmask ${NETMASK} +. /etc/sysconfig/network + +ifconfig ${DEVICE} ${IPADDR} ${opts} pointopoint ${GATEWAY} netmask ${NETMASK} if [ "${NETWORK}" != "" ] ; then - route add -host ${REMIP} metric 1 ${DEVICE} + route add -host ${GATEWAY} metric 1 ${DEVICE} fi -. /etc/sysconfig/network if [ "${GATEWAY}" != "" ]; then if [ "${GATEWAYDEV}" = "" -o "${GATEWAYDEV}" = "${DEVICE}" ]; then |