From d91971631c6b8c7b1c5a102316b850a82f60236f Mon Sep 17 00:00:00 2001
From: Marius Tolzmann <tolzmann@molgen.mpg.de>
Date: Fri, 13 Mar 2015 11:48:10 +0100
Subject: [PATCH] also rename device when removing ip from former ethX device

---
 mxvipctl | 21 +++++++++++++++------
 1 file changed, 15 insertions(+), 6 deletions(-)

diff --git a/mxvipctl b/mxvipctl
index 9d5f520..09ae4ad 100755
--- a/mxvipctl
+++ b/mxvipctl
@@ -105,13 +105,22 @@ function mxvip_stop_one() {
    i=0
    while [ ${i} -lt ${mip} ] ; do
 #       echo "  $i -> ${MX_IP_ADDRESS[$i]}"
-       
-       echo "removing ip ${MX_IP_ADDRESS[$i]}/${MX_IP_ADDRESSPREFIX[$i]} broadcast ${MX_IP_BROADCAST[$i]} to ${MX_IP_DEVICE[$i]}"
-       
-       ${CMD_IP} addr del ${MX_IP_ADDRESS[$i]}/${MX_IP_ADDRESSPREFIX[$i]} broadcast ${MX_IP_BROADCAST[$i]} dev ${MX_IP_DEVICE[$i]}
+
+        dev=${MX_IP_DEVICE[$i]}
+
+        if [ ! -d  "/sys/class/net/${dev}" -a "${dev:0:3}" = "eth" ] ; then
+            net=$(printf "net%02d" "${dev:3}")
+            if [ -d "/sys/class/net/${net}" ] ; then
+                MX_IP_DEVICE[$i]=$net
+            fi
+        fi
+
+        echo "removing ip ${MX_IP_ADDRESS[$i]}/${MX_IP_ADDRESSPREFIX[$i]} broadcast ${MX_IP_BROADCAST[$i]} to ${MX_IP_DEVICE[$i]}"
+
+        ${CMD_IP} addr del ${MX_IP_ADDRESS[$i]}/${MX_IP_ADDRESSPREFIX[$i]} broadcast ${MX_IP_BROADCAST[$i]} dev ${MX_IP_DEVICE[$i]}
 #       echo "${CMD_IP} link set up dev ${MX_IP_DEVICE[$i]}"
-       
-       i=i+1
+
+        i=i+1
    done 
 
    unset ${!MX_IP_*}