aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--initscripts.spec5
-rwxr-xr-xsysconfig/network-scripts/ifup-ippp13
2 files changed, 16 insertions, 2 deletions
diff --git a/initscripts.spec b/initscripts.spec
index a17d6620..4a5a1daf 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.62
+Version: 7.63
License: GPL
Group: System Environment/Base
Release: 1
@@ -250,6 +250,9 @@ rm -rf $RPM_BUILD_ROOT
%ghost %attr(0664,root,utmp) /var/run/utmp
%changelog
+* Thu Aug 19 2004 Than Ngo <than@redhat.com> 7.63-1
+- allow CBCP with own number (#125710)
+
* Thu Aug 19 2004 Bill Nottingham <notting@redhat.com> 7.62-1
- fix up resolv.conf munging (#129921)
- use rngd if available
diff --git a/sysconfig/network-scripts/ifup-ippp b/sysconfig/network-scripts/ifup-ippp
index fd1b8bdb..7a72a333 100755
--- a/sysconfig/network-scripts/ifup-ippp
+++ b/sysconfig/network-scripts/ifup-ippp
@@ -283,7 +283,18 @@ function addprovider()
[ -n "$MTU" ] && options="$options mtu $MTU"
# set CBCP protocoll
- [ "$CBCP" = "on" ] && options="$options callback 6"
+ if [ "$CBCP" = "on" ] ; then
+ if [ -n "$CBCP_MSN" ] ; then
+ # User managed callback
+ options="$options callback $CBCP_MSN"
+ else
+ # admin managed callback, it's enabled by default
+ options="$options callback 6"
+ fi
+ else
+ # Disable CBCP
+ options="$options -callback-cbcp"
+ fi
# set CCP protocoll
[ "$CCP" = "off" ] && options="$options noccp"