Prefer iproute over ifconfig

Signed-off-by: Stéphane Graber <stgraber@ubuntu.com>
Acked-by: Serge E. Hallyn <serge.hallyn@ubuntu.com>

diff --git a/config/init/common/lxc-net.in b/config/init/common/lxc-net.in
index dcbe15565906408c2b731bd8df0fe5fdb1f8a71e..988d2f9076c61fd1020eb7d280e153ce011d6f64 100644 (file)
--- a/config/init/common/lxc-net.in
+++ b/config/init/common/lxc-net.in
@@ -35,29 +35,31 @@ _netmask2cidr ()
 }
 
 ifdown() {
-    which ifconfig >/dev/null 2>&1
-    if [ $? = 0 ]; then
-        ifconfig $1 down
-        return
-    fi
     which ip >/dev/null 2>&1
     if [ $? = 0 ]; then
         ip link set dev $1 down
+        return
     fi
-}
-
-ifup() {
     which ifconfig >/dev/null 2>&1
     if [ $? = 0 ]; then
-        ifconfig $1 $2 netmask $3 up
+        ifconfig $1 down
         return
     fi
+}
+
+ifup() {
     which ip >/dev/null 2>&1
     if [ $? = 0 ]; then
         MASK=`_netmask2cidr ${LXC_NETMASK}`
         CIDR_ADDR="${LXC_ADDR}/${MASK}"
         ip addr add ${CIDR_ADDR} dev $1
         ip link set dev $1 up
+        return
+    fi
+    which ifconfig >/dev/null 2>&1
+    if [ $? = 0 ]; then
+        ifconfig $1 $2 netmask $3 up
+        return
     fi
 }
 

diff --git a/src/lxc/lxc-restore-net b/src/lxc/lxc-restore-net
index 1725dc3a9cddbd6cb3927273d9c85f75edc505a4..6ae3c1988a4fc37210ae7ea84cab410ef6d3edb2 100755 (executable)
--- a/src/lxc/lxc-restore-net
+++ b/src/lxc/lxc-restore-net
@@ -17,7 +17,7 @@ while true; do
 
        if [ "$CRTOOLS_SCRIPT_ACTION" = "network-unlock" ]; then
                brctl addif $bridge $veth
-               ifconfig $veth 0.0.0.0 up
+               ip link set dev $veth up
        fi
 
        i=$((i+1))