aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThan Ngo <than@redhat.com>2001-09-03 13:56:55 +0000
committerThan Ngo <than@redhat.com>2001-09-03 13:56:55 +0000
commit6107f6863630a0e4f41e10fea015637a93a18b22 (patch)
treed29241639469fade8eb8d2595aa30908086bf959
parent51d26960c3c46284d77c0db2d0003a5400c18120 (diff)
downloadinitscripts-r6-36.tar
initscripts-r6-36.tar.gz
initscripts-r6-36.tar.bz2
initscripts-r6-36.tar.xz
initscripts-r6-36.zip
* don't start pppbind if encapsulation is rawip (bug #52491)r6-36
-rw-r--r--ChangeLog6
-rw-r--r--initscripts.spec5
-rwxr-xr-xsysconfig/network-scripts/ifup-ippp4
3 files changed, 13 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 8ec9fa1f..a18d5dac 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,10 @@
2001-09-03 Than Ngo <than@redhat.com>
+ * ChangeLog, initscripts.spec: 6.36-1
+
+ * sysconfig/network-scripts/ifup-ippp
+ don't start pppbind if encapsulation is rawip (bug #52491)
+
+2001-09-03 Than Ngo <than@redhat.com>
* ChangeLog, initscripts.spec: 6.35-1
* sysconfig/network-scripts/ifdown-ippp, sysconfig/network-scripts/ifup-ippp
diff --git a/initscripts.spec b/initscripts.spec
index 5985dba4..9f4a0f2c 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.35
+Version: 6.36
License: GPL
Group: System Environment/Base
Release: 1
@@ -239,6 +239,9 @@ rm -rf $RPM_BUILD_ROOT
%dir /etc/locale/*/LC_MESSAGES
%changelog
+* Mon Sep 3 2001 Than Ngo <than@redhat.com>
+- don't start pppbind if encapsulation is rawip (bug #52491)
+
* Sun Sep 2 2001 Than Ngo <than@redhat.com>
- add ISDN patches from pekkas@netcore.fi and pb@bieringer.de (bug #52491)
- fix handling of ISDN LSZ Compresssion
diff --git a/sysconfig/network-scripts/ifup-ippp b/sysconfig/network-scripts/ifup-ippp
index 14cc514b..1f5b5756 100755
--- a/sysconfig/network-scripts/ifup-ippp
+++ b/sysconfig/network-scripts/ifup-ippp
@@ -181,7 +181,9 @@ function addprovider()
[ -n "$CBHUP" ] && log_isdnctrl cbhup $DEVICE $CBHUP
options="$options ipparam $DEVICE"
- log_isdnctrl pppbind $DEVICE
+
+ [ "$ENCAP" = "syncppp" ] && log_isdnctrl pppbind $DEVICE
+
if [ "$IPADDR" = "0.0.0.0" ]; then
options="$options ipcp-accept-local"
else