diff options
| author | Than Ngo <than@redhat.com> | 2001-08-29 15:10:09 +0000 |
|---|---|---|
| committer | Than Ngo <than@redhat.com> | 2001-08-29 15:10:09 +0000 |
| commit | 633f47836273c3895f52659e7d3eefa38eb8fcda (patch) | |
| tree | b12294c0c7144f3f18f0cb2fb216b62b4e89e1cf /sysconfig | |
| parent | b8fd7e66aec3c1dd4c28e6bce7713b99349a4102 (diff) | |
| download | initscripts-633f47836273c3895f52659e7d3eefa38eb8fcda.tar initscripts-633f47836273c3895f52659e7d3eefa38eb8fcda.tar.gz initscripts-633f47836273c3895f52659e7d3eefa38eb8fcda.tar.bz2 initscripts-633f47836273c3895f52659e7d3eefa38eb8fcda.tar.xz initscripts-633f47836273c3895f52659e7d3eefa38eb8fcda.zip | |
- fix ISDN dial on demand bugr6-32
- fix typo bug in network-functions
Diffstat (limited to 'sysconfig')
| -rwxr-xr-x | sysconfig/network-scripts/ifdown-post | 11 | ||||
| -rwxr-xr-x | sysconfig/network-scripts/ifup-ippp | 10 | ||||
| -rw-r--r-- | sysconfig/network-scripts/network-functions | 2 |
3 files changed, 16 insertions, 7 deletions
diff --git a/sysconfig/network-scripts/ifdown-post b/sysconfig/network-scripts/ifdown-post index db9d3f53..04d516d5 100755 --- a/sysconfig/network-scripts/ifdown-post +++ b/sysconfig/network-scripts/ifdown-post @@ -24,7 +24,16 @@ fi # Reset the default route if this interface had a special one if ! check_default_route ; then - add_default_route ${DEVICE} + # ISDN device needs special handling dial on demand + if [ "${DEVICETYPE}" = "ippp" -o "${DEVICETYPE}" = "isdn" ] && [ "$DIALMODE" = "auto" ] ; then + if [ -z "$GATEWAY" ] ; then + /sbin/ip route add default dev ${DEVICE} + else + /sbin/ip route add default via ${GATEWAY} + fi + else + add_default_route ${DEVICE} + fi fi # Notify programs that have requested notification diff --git a/sysconfig/network-scripts/ifup-ippp b/sysconfig/network-scripts/ifup-ippp index ad38ff04..5b15f303 100755 --- a/sysconfig/network-scripts/ifup-ippp +++ b/sysconfig/network-scripts/ifup-ippp @@ -103,8 +103,8 @@ function addprovider() [ -z "$L3_PROT" ] && L3_PROT="trans" # check local/remote IP - [ -z "$IPADDR" ] && IPADDR="0.0.0.0" - [ -z "$GATEWAY" ] && GATEWAY="0.0.0.0" + [ -z "$IPADDR" ] && IPADDR="10.112.112.112" + [ -z "$GATEWAY" ] && GATEWAY="10.112.112.113" # set default route [ "$DEFROUTE" = "yes" ] && options="$options deldefaultroute" @@ -181,7 +181,7 @@ function addprovider() options="$options ipparam $DEVICE" log_isdnctrl pppbind $DEVICE - if [ "$IPADDR" = "0.0.0.0" ]; then + if [ "$IPADDR" = "10.112.112.112" ]; then options="$options ipcp-accept-local" else options="$options noipdefault" @@ -247,7 +247,7 @@ function addprovider() [ -n "$SLAVE_TRIGGER" ] && log_isdnctrl trigger $DEVICE $SLAVE_TRIGGER fi - if [ "$GATEWAY" = "0.0.0.0" ]; then + if [ "$GATEWAY" = "10.112.112.113" ]; then options="$options ipcp-accept-remote" options="$IPADDR:$GATEWAY $options" else @@ -316,7 +316,7 @@ function addprovider() if [ "$DIALMODE" = "auto" ]; then echo 1 > /proc/sys/net/ipv4/ip_dynaddr route del default >/dev/null 2>&1 - if [ "$GATEWAY" = "0.0.0.0" ]; then + if [ "$GATEWAY" = "10.112.112.113" ]; then route add default $DEVICE >/dev/null 2>&1 else route add default gw $GATEWAY >/dev/null 2>&1 diff --git a/sysconfig/network-scripts/network-functions b/sysconfig/network-scripts/network-functions index 934f55ae..991b5370 100644 --- a/sysconfig/network-scripts/network-functions +++ b/sysconfig/network-scripts/network-functions @@ -182,7 +182,7 @@ add_default_route () if [ "${GATEWAY}" != "" -a "${GATEWAY}" != "none" -a "${GATEWAYDEV}" != "" ] ; then if ! check_device_down $1; then if [ "$GATEWAY" = "0.0.0.0" ]; then - /sbin/ip route add default ${GATEWAYDEV} + /sbin/ip route add default dev ${GATEWAYDEV} else /sbin/ip route add default via ${GATEWAY} fi |