Forking netcfg to netctl (2/2)

This commit contains the refactoring and rewriting of code.

1 files changed, 18 insertions, 23 deletions

diff --git a/src/lib/connections/bond b/src/lib/connections/bond
index bc5aa95..09e51c6 100644
--- a/src/lib/connections/bond
+++ b/src/lib/connections/bond
@@ -1,40 +1,35 @@
-#! /bin/bash
-. /usr/lib/network/network
+# Contributed by: Byron Williams <byron@112percent.com>
+
+. "$SUBR_DIR/ip"
+
 IFENSLAVE="/sbin/ifenslave"
 
 bond_up() {
-    load_profile "$1"
-
-    if [[ -e "/sys/class/net/$INTERFACE" ]]; then
-        report_fail "Interface $INTERFACE already exists."
-        exit 1
+    if is_interface "$Interface"; then
+        report_error "Interface '$Interface' already exists"
+        return 1
     else
-        ip link add dev $INTERFACE type bond
+        ip link add dev "$Interface" type bond
     fi
-    bring_interface up "$INTERFACE"
+    bring_interface_up "$Interface"
 
-    for slave in "${SLAVE_INTERFACES[@]}"; do
-        bring_interface up "$slave"
-        $IFENSLAVE $INTERFACE $slave
+    for slave in "${BindsToInterfaces[@]}"; do
+        bring_interface_up "$slave"
+        $IFENSLAVE "$Interface" "$slave"
     done
 
-    "$CONN_DIR/ethernet" up "$1"
-    return 0
+    ip_set
 }
 
 bond_down() {
-    load_profile "$1"
-
-    for slave in "${SLAVE_INTERFACES[@]}"; do
-        $IFENSLAVE $INTERFACE -d $slave
+    for slave in "${BindsToInterfaces[@]}"; do
+        $IFENSLAVE "$Interface" -d "$slave"
     done
 
-    "$CONN_DIR/ethernet" down "$1"
-    ip link delete "$INTERFACE"
-    return 0
+    ip_unset
+    bring_interface_down "$Interface"
+    ip link delete "$Interface"
 }
 
-bond_$1 "$2"
-exit $?
 
 # vim: set ts=4 et sw=4: