Change in vdsm[master]: shell_helper: ignore iproute2's @NONE

osvoboda at redhat.com osvoboda at redhat.com
Tue Oct 13 11:26:02 UTC 2015


Ondřej Svoboda has uploaded a new change for review.

Change subject: shell_helper: ignore iproute2's @NONE
......................................................................

shell_helper: ignore iproute2's @NONE

Change-Id: Idc8e950e02e5102f33afcb3b12493efadc2c66c1
Signed-off-by: Ondřej Svoboda <osvoboda at redhat.com>
---
M contrib/shell_helper
1 file changed, 9 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/66/47266/1

diff --git a/contrib/shell_helper b/contrib/shell_helper
index 7dc2984..d81a86a 100755
--- a/contrib/shell_helper
+++ b/contrib/shell_helper
@@ -107,21 +107,27 @@
 
 del_dummies() {
     for nic in `ip l | awk '{print $2;}' | egrep "^dummy"`; do
-        sudo ip link del dev ${nic%:*}
+        nic=${nic%:*}
+        nic=${nic%@NONE}
+        sudo ip link del dev $nic
     done
     sudo rm /etc/sysconfig/network-scripts/ifcfg-dummy*
 }
 
 del_veths() {
     for nic in `ip l | awk '{print $2;}' | egrep "^veth"`; do
-        sudo ip link del dev ${nic%:*}
+        nic=${nic%:*}
+        nic=${nic%@NONE}
+        sudo ip link del dev $nic
     done
     sudo rm /etc/sysconfig/network-scripts/ifcfg-veth*
 }
 
 del_bonds() {
     for nic in `ip l | awk '{print $2;}' | egrep "^bond"`; do
-        echo "-${nic%:*}" | sudo tee /sys/class/net/bonding_masters
+        nic=${nic%:*}
+        nic=${nic%@NONE}
+        echo "-$nic" | sudo tee /sys/class/net/bonding_masters
     done
     sudo rm /etc/sysconfig/network-scripts/ifcfg-bond*
 }


-- 
To view, visit https://gerrit.ovirt.org/47266
To unsubscribe, visit https://gerrit.ovirt.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Idc8e950e02e5102f33afcb3b12493efadc2c66c1
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Ondřej Svoboda <osvoboda at redhat.com>


More information about the vdsm-patches mailing list