aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog9
-rw-r--r--initscripts.spec6
-rwxr-xr-xsysconfig/network-scripts/ifdown-post11
-rwxr-xr-xsysconfig/network-scripts/ifup-ippp10
-rw-r--r--sysconfig/network-scripts/network-functions2
5 files changed, 30 insertions, 8 deletions
diff --git a/ChangeLog b/ChangeLog
index 76132bfb..0fb1dcc9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2001-08-29 Than Ngo <than@redhat.com>
+ * ChangeLog, initscripts.spec: 6.32-1
+
+ * sysconfig/network-scripts/ifdown-post, sysconfig/network-scripts/ifup-ippp
+ fix ISDN dial on demand bug
+
+ * sysconfig/network-scripts/network-functions
+ fix typo bug
+
2001-08-29 Bill Nottingham <notting@redhat.com>
* ChangeLog, initscripts.spec: 6.31-1
diff --git a/initscripts.spec b/initscripts.spec
index 5318c2dc..fe0dbc15 100644
--- a/initscripts.spec
+++ b/initscripts.spec
@@ -1,6 +1,6 @@
Summary: The inittab file and the /etc/init.d scripts.
Name: initscripts
-Version: 6.31
+Version: 6.32
License: GPL
Group: System Environment/Base
Release: 1
@@ -239,6 +239,10 @@ rm -rf $RPM_BUILD_ROOT
%dir /etc/locale/*/LC_MESSAGES
%changelog
+* Wed Aug 29 2001 Than Ngo <than@redhat.com>
+- fix ISDN dial on demand bug
+- fix typo bug in network-functions
+
* Tue Aug 28 2001 Nalin Dahyabhai <nalin@redhat.com>
- document /etc/sysconfig/authconfig
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