From 4826b887874b50dec78c28716a85b74b30140180 Mon Sep 17 00:00:00 2001
From: Than Ngo <than@redhat.com>
Date: Mon, 29 Oct 2001 15:29:58 +0000
Subject: - fix bug in channel bundling if MSN is missed - support DEBUG option

---
 ChangeLog                           | 5 +++++
 initscripts.spec                    | 6 +++++-
 sysconfig/network-scripts/ifup-ippp | 5 -----
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index d230fa5a..d8a67862 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2001-10-29  Than Ngo  <than@redhat.com>
+	* sysconfig/network-scripts/ifup-ippp
+	fix bug in channel bundling if MSN is missed
+	support DEBUG option
+	
 2001-09-21  romanm  <romanm@redhat.com>
 
 	* po/sl.po: partially translated
diff --git a/initscripts.spec b/initscripts.spec
index 8a8fbfa8..d10ee6b4 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.41
+Version: 6.42
 License: GPL
 Group: System Environment/Base
 Release: 1
@@ -240,6 +240,10 @@ rm -rf $RPM_BUILD_ROOT
 %dir /etc/locale/*/LC_MESSAGES
 
 %changelog
+* Mon Oct 29 2001 Than Ngo <than@redhat.com>
+- fix bug in channel bundling if MSN is missed
+- support DEBUG option
+	
 * Wed Sep 19 2001 Than Ngo <than@redhat.com>
 - don't show user name by DSL connection
 
diff --git a/sysconfig/network-scripts/ifup-ippp b/sysconfig/network-scripts/ifup-ippp
index 1f5b5756..de314e58 100755
--- a/sysconfig/network-scripts/ifup-ippp
+++ b/sysconfig/network-scripts/ifup-ippp
@@ -13,7 +13,6 @@ cd /etc/sysconfig/network-scripts
 # Get global network configuration
 [ -f /etc/sysconfig/network ] && . /etc/sysconfig/network
 
-DEBUG="no"
 GATEWAY=""
 
 # set device
@@ -195,10 +194,6 @@ function addprovider()
     # set channel bundling
     if [ "$BUNDLING" = "yes" -o "$BUNDLING" = "on" ] && [ -n "$SLAVE_DEVICE" ]; then
         [ -z "$SLAVE_MSN" ] && SLAVE_MSN="$MSN"
-        if [ -z "$SLAVE_MSN" ]; then
-            log_echo "Error: $1: SLAVE_MSN not set"
-            exit 1
-        fi
         [ -z "$SLAVE_PHONE_OUT" ] && SLAVE_PHONE_OUT="$PHONE_OUT"
         [ -z "$SLAVE_PHONE_IN" ] && SLAVE_PHONE_IN="$PHONE_IN"
         [ -z "$SLAVE_HUPTIMEOUT" ] && SLAVE_HUPTIMEOUT="$HUPTIMEOUT"
-- 
cgit v1.2.1