X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=utilities%2Fovs-save;h=297c2fa3faab6b8736fb2eb4c1a2bb165f80c912;hb=54fa24c559938dec9be7cb64de741fe36ee83e07;hp=b2c726eb40c854831ff21126b9b81fd0bdce2e31;hpb=f7a122fc2457f805fd0906f4368ea42d2ea55584;p=sliver-openvswitch.git

diff --git a/utilities/ovs-save b/utilities/ovs-save
index b2c726eb4..297c2fa3f 100755
--- a/utilities/ovs-save
+++ b/utilities/ovs-save
@@ -1,6 +1,6 @@
 #! /bin/sh
 
-# Copyright (c) 2011 Nicira Networks, Inc.
+# Copyright (c) 2011 Nicira, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -54,7 +54,7 @@ fi
 
 devs=$*
 for dev in $devs; do
-    state=`ip link show $dev` || continue
+    state=`ip link show dev $dev` || continue
 
     echo "# $dev"
     # Link state (Ethernet addresses, up/down, ...)
@@ -83,12 +83,12 @@ for dev in $devs; do
         linkcmd="$linkcmd mtu $mtu"
     fi
     if test -n "$linkcmd"; then
-        echo ip link set $dev down # Required to change hwaddr.
-        echo ip link set $dev $linkcmd
+        echo ip link set dev $dev down # Required to change hwaddr.
+        echo ip link set dev $dev $linkcmd
     fi
 
     # IP addresses (including IPv6).
-    echo "ip addr flush $dev 2>/dev/null" # Suppresses "Nothing to flush".
+    echo "ip addr flush dev $dev 2>/dev/null" # Suppresses "Nothing to flush".
     ip addr show dev $dev | while read addr; do
         set -- $addr
 
@@ -115,8 +115,9 @@ for dev in $devs; do
                         continue 2
                     fi
                     ;;
-                "$dev")
-                    # Omit because "ip" wants "dev" keyword in front.
+                "$dev"|"$dev:"*)
+                    # Address label string
+                    addrcmd="$addrcmd label $1"
                     shift
                     continue
                     ;;