Author: glen
Date: Thu Jun 14 20:42:00 2007
New Revision: 8640
Removed:
rc-scripts/trunk/sysconfig/interfaces/ifcfg-bond0
rc-scripts/trunk/sysconfig/network-scripts/bonddown
rc-scripts/trunk/sysconfig/network-scripts/bondup
Modified:
rc-scripts/trunk/rc.d/init.d/network
rc-scripts/trunk/sysconfig/interfaces/Makefile.am
rc-scripts/trunk/sysconfig/network-scripts/Makefile.am
Log:
- revert bonding support (unfinished and broken)
Modified: rc-scripts/trunk/rc.d/init.d/network
==============================================================================
--- rc-scripts/trunk/rc.d/init.d/network (original)
+++ rc-scripts/trunk/rc.d/init.d/network Thu Jun 14 20:42:00 2007
@@ -146,7 +146,7 @@
interfaces_boot=`
for i in $ifcfg_files; do
case ${i##*/} in
-
ifcfg-lo|ifcfg-sit*|ifcfg-atm*|ifcfg-lec*|ifcfg-nas*|ifcfg-br*|ifcfg-bond*|ifcfg-*.*)
continue ;;
+
ifcfg-lo|ifcfg-sit*|ifcfg-atm*|ifcfg-lec*|ifcfg-nas*|ifcfg-br*|ifcfg-*.*)
continue ;;
esac
ONBOOT=""; . "$i" 2>/dev/null
[ ${ONBOOT:-no} = yes ] && echo "${i##*/ifcfg-}"
@@ -185,18 +185,6 @@
[ ${ONBOOT:-no} = yes ] && echo "${i##*/ifcfg-}"
done
`
-
- interfaces_bond_boot=`
- for i in $ifcfg_files; do
- case ${i##*/} in
- ifcfg-bond*) ;;
- *) continue ;;
- esac
- ONBOOT=""; . "$i" 2>/dev/null
- [ ${ONBOOT:-no} = yes ] && echo "${i##*/ifcfg-}"
- done
- `
-
fi
tunnels=`
@@ -215,10 +203,6 @@
run_cmd -a "$(nls 'Bringing up interface %s' "$i")" /sbin/ifup
$i boot
done
- for i in $interfaces_bond_boot; do
- run_cmd -a "$(nls 'Bringing up bonding interface %s' "$i")"
/sbin/bondup $i boot
- done
-
for i in $interfaces_br_boot ; do
run_cmd -a "$(nls 'Bringing up bridge interface %s' "$i")"
/sbin/ifup $i boot
done
@@ -265,10 +249,6 @@
run_cmd -a "$(nls 'Shutting down bridge interface %s' "$i")"
/sbin/ifdown $i boot
done
- for i in $interfaces_bond_boot; do
- run_cmd -a "$(nls 'Shutting down bonding interface %s' "$i")"
/sbin/bonddown $i boot
- done
-
for i in $interfaces_sit_boot $interfaces_vlan_boot $interfaces_boot ;
do
run_cmd -a "$(nls 'Shutting down interface %s' "$i")"
/sbin/ifdown $i boot
done
Modified: rc-scripts/trunk/sysconfig/interfaces/Makefile.am
==============================================================================
--- rc-scripts/trunk/sysconfig/interfaces/Makefile.am (original)
+++ rc-scripts/trunk/sysconfig/interfaces/Makefile.am Thu Jun 14 20:42:00 2007
@@ -7,7 +7,6 @@
interfaces_DATA = ifcfg-eth0
noinst_DATA = \
- ifcfg-bond0 \
ifcfg-br0 \
ifcfg-description \
ifcfg-eth0.1 \
Modified: rc-scripts/trunk/sysconfig/network-scripts/Makefile.am
==============================================================================
--- rc-scripts/trunk/sysconfig/network-scripts/Makefile.am (original)
+++ rc-scripts/trunk/sysconfig/network-scripts/Makefile.am Thu Jun 14
20:42:00 2007
@@ -4,9 +4,7 @@
ifdown \
ifup \
tnldown \
- tnlup \
- bonddown \
- bondup
+ tnlup
networkscriptsdir = @networkscriptsdir@
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
