From bb136dc06679812ea53669cd9a5885ad8d3935cb Mon Sep 17 00:00:00 2001
From: Than Ngo <than@redhat.com>
Date: Fri, 10 Aug 2001 14:56:06 +0000
Subject: * fix channel bundling

---
 ChangeLog                             | 1 +
 initscripts.spec                      | 1 +
 sysconfig/network-scripts/ifdown-post | 7 +++----
 sysconfig/network-scripts/ifup-ippp   | 4 ++--
 4 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 16050f05..c303d209 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,7 @@
 	* sysconfig/network-scripts/ifup-ippp
 	don't set MSN if it' empty (it's now optional)
 	don't give login name as a cmdline-option (Bug #23066)
+	fix Channel bundling
 
 	* sysconfig//network-scripts/ifdown-post
 	remove peer device file if ppp connection is down
diff --git a/initscripts.spec b/initscripts.spec
index 688c4395..7baa2a81 100644
--- a/initscripts.spec
+++ b/initscripts.spec
@@ -242,6 +242,7 @@ rm -rf $RPM_BUILD_ROOT
 - don't set MSN if it' empty (it's now optional)
 - don't give login name as a cmdline-option (Bug #23066)
 - remove peer device file if ppp connection is down
+- fix channel bundling
 
 * Thu Aug  9 2001 Bill Nottingham <notting@redhat.com>
 - require SysVinit (#51335)
diff --git a/sysconfig/network-scripts/ifdown-post b/sysconfig/network-scripts/ifdown-post
index b42c9a5a..db9d3f53 100755
--- a/sysconfig/network-scripts/ifdown-post
+++ b/sysconfig/network-scripts/ifdown-post
@@ -17,10 +17,9 @@ if [ "${DEVICETYPE}" = "ppp" -o "${DEVICETYPE}" = "ippp" ]; then
 	cat /etc/resolv.conf.save > /etc/resolv.conf
 	rm -f /etc/resolv.conf.save
     fi
-fi
-
-if [ -f /etc/ppp/peers/$DEVICE ] ; then
-    rm -f /etc/ppp/peers/$DEVICE
+    if [ -f /etc/ppp/peers/$DEVICE ] ; then
+	rm -f /etc/ppp/peers/$DEVICE
+    fi
 fi
 
 # Reset the default route if this interface had a special one
diff --git a/sysconfig/network-scripts/ifup-ippp b/sysconfig/network-scripts/ifup-ippp
index 32d56495..8ab1680f 100755
--- a/sysconfig/network-scripts/ifup-ippp
+++ b/sysconfig/network-scripts/ifup-ippp
@@ -177,7 +177,7 @@ function addprovider()
     options="$options /dev/$DEVICE"
  
     # set channel bundling
-    if [ "$BUNDLING" = "yes" -a -n "$SLAVE_DEVICE" ]; then
+    if [ "$BUNDLING" = "yes" -o "$BUNDLING" = "on" ] && [ -n "$SLAVE_DEVICE" ]; then
         [ -z "$SLAVE_MSN" ] && SLAVE_MSN="$MSN"
         [ -z "$SLAVE_PHONE_OUT" ] && SLAVE_PHONE_OUT="$PHONE_OUT"
         [ -z "$SLAVE_PHONE_IN" ] && SLAVE_PHONE_IN="$PHONE_IN"
@@ -296,7 +296,7 @@ function addprovider()
         ipppd $options
 
         # start ibod daemon
-        [ "$BUNDLING" = "yes" -a -n "$SLAVE_DEVICE" ] && start_ibod $DEVICE
+        [ "$BUNDLING" = "yes" -o "$BUNDLING" = "on" ] && [ -n "$SLAVE_DEVICE" ] && start_ibod $DEVICE
     fi
 
     # set default gateway for dial on demand
-- 
cgit v1.2.1