aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog7
-rw-r--r--initscripts.spec5
-rwxr-xr-xsysconfig/network-scripts/ifup-ippp8
3 files changed, 18 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index f1365be3..16c66e9b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2001-07-16 Than Ngo <than@redhat.com>
+
+ * ChangeLog, initscripts.spec:
+ 6.03-1
+
+ * sysconfig/network-scripts/ifup-ippp
+
2001-07-11 Bill Nottingham <notting@redhat.com>
* ChangeLog, initscripts.spec:
diff --git a/initscripts.spec b/initscripts.spec
index 8818c7ab..92a2b925 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.02
+Version: 6.03
License: GPL
Group: System Environment/Base
Release: 1
@@ -234,6 +234,9 @@ rm -rf $RPM_BUILD_ROOT
%ghost %attr(0664,root,utmp) /var/run/utmp
%changelog
+* Mon Jul 16 2001 Than Ngo <than@redhat.com>
+- fix country_code for ISDN
+
* Tue Jul 9 2001 Bill Nottingham <notting@redhat.com>
- fix '--check'
- prereq sh-utils (#43065)
diff --git a/sysconfig/network-scripts/ifup-ippp b/sysconfig/network-scripts/ifup-ippp
index a560603b..45c2138c 100755
--- a/sysconfig/network-scripts/ifup-ippp
+++ b/sysconfig/network-scripts/ifup-ippp
@@ -88,7 +88,7 @@ function addprovider()
[ -z "$REMOTE_IP" ] && REMOTE_IP="0.0.0.0"
# set default route
- [ "$DELDEFAULTROUTE" = "enabled" -o -z "$DELDEFAULTROUTE" ] && options="$options deldefaultroute"
+ [ "$DEFROUTE" = "yes" ] && options="$options deldefaultroute"
# set authentication
[ -z "$USER" ] && USER="dialup"
@@ -105,6 +105,12 @@ function addprovider()
log_isdnctrl eaz $DEVICE $MSN
# set dialout numbers
+ if echo $COUNTRYCODE | grep ":" >/dev/null 2>&1 ; then
+ COUNTRYCODE="$(echo $COUNTRYCODE | cut -f 2 -d ':')"
+ [ "$COUNTRYCODE" = "0" ] && COUNTRYCODE=
+ else
+ COUNTRYCODE=
+ fi
for i in $PHONE_OUT; do
log_isdnctrl addphone $DEVICE out $COUNTRYCODE$PREFIX$AREACODE$i
done