aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThan Ngo <than@redhat.com>2001-08-21 12:41:40 +0000
committerThan Ngo <than@redhat.com>2001-08-21 12:41:40 +0000
commit93e74614c9521f3a05c1ce8de7ebfbe4527da63c (patch)
tree06a789d2a8e50a004e079a0118d0a1e9b080307a
parent756dc1a0ba9204c5d9daa5d0f3f76065c5e8eabe (diff)
downloadinitscripts-93e74614c9521f3a05c1ce8de7ebfbe4527da63c.tar
initscripts-93e74614c9521f3a05c1ce8de7ebfbe4527da63c.tar.gz
initscripts-93e74614c9521f3a05c1ce8de7ebfbe4527da63c.tar.bz2
initscripts-93e74614c9521f3a05c1ce8de7ebfbe4527da63c.tar.xz
initscripts-93e74614c9521f3a05c1ce8de7ebfbe4527da63c.zip
- fix shutdown/Bringing up isdn devicer6-23
-rw-r--r--ChangeLog4
-rw-r--r--initscripts.spec5
-rwxr-xr-xsysconfig/network-scripts/ifdown-ippp2
-rwxr-xr-xsysconfig/network-scripts/ifup-ippp14
4 files changed, 20 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index d169277c..de399532 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2001-08-21 Than Ngo <than@redhat.com>
+ * sysconfig/network-scripts/ifup-ippp, sysconfig/network-scripts/ifdown-ippp
+ - fix shutdown/Bringing up isdn device
+
2001-08-20 Karsten Hopp <karsten@redhat.de>
* initscripts.spec, ifup-escon:
diff --git a/initscripts.spec b/initscripts.spec
index e8f7774c..215fbcfc 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.22
+Version: 6.23
License: GPL
Group: System Environment/Base
Release: 1
@@ -239,6 +239,9 @@ rm -rf $RPM_BUILD_ROOT
%dir /etc/locale/*/LC_MESSAGES
%changelog
+* Tue Aug 21 2001 Than Ngo <than@redhat.com>
+- fix shutdown/Bringing up isdn device
+
* Mon Aug 20 2001 Nalin Dahyabhai <nalin@redhat.com>
- fix syntax error in lang.csh
- set codeset by echoing to /dev/tty instead of /proc/self/fd/15
diff --git a/sysconfig/network-scripts/ifdown-ippp b/sysconfig/network-scripts/ifdown-ippp
index f124a867..903d77dc 100755
--- a/sysconfig/network-scripts/ifdown-ippp
+++ b/sysconfig/network-scripts/ifdown-ippp
@@ -13,6 +13,8 @@ if [ -f /var/lock/subsys/ibod ] ; then
fi
# shutdown isdn device
+isdnctrl hangup $DEVICE >/dev/null 2>&1
+sleep 1
ifconfig $DEVICE down >/dev/null 2>&1
# delete isdn device
diff --git a/sysconfig/network-scripts/ifup-ippp b/sysconfig/network-scripts/ifup-ippp
index 8ab1680f..04deb54f 100755
--- a/sysconfig/network-scripts/ifup-ippp
+++ b/sysconfig/network-scripts/ifup-ippp
@@ -28,10 +28,12 @@ if [ ! -x /usr/sbin/isdnctrl -a ! -x /sbin/isdnctrl ] ; then
exit 1
fi
-# load provider config
-#[ -f /etc/sysconfig/networking/devices/$DEVICE.d/dialup ] || exit 1
-#. /etc/sysconfig/networking/devices/$DEVICE.d/dialup
-
+# check all ISDN devices
+if ! isdnctrl list all >/dev/null 2>&1 ; then
+ logger -p daemon.info -t ifup-ippp "cannot list ISDN devices"
+ exit 1
+fi
+
# check if device already is configured
isdnctrl list $DEVICE >/dev/null 2>&1 && exit 0
@@ -311,6 +313,10 @@ function addprovider()
fi
}
+if [ ! -f /var/lock/subsys/isdn -a -x /etc/rc.d/init.d/isdn ] ; then
+ /etc/rc.d/init.d/isdn start
+fi
+
addprovider || exit 1
/etc/sysconfig/network-scripts/ifup-post $CONFIG