ofp-ed-props: Fix using uninitialized padding for NSH encap actions.

[mirror_ovs.git] / utilities / ovs-save

diff --git a/utilities/ovs-save b/utilities/ovs-save
index bcb8e9b8aef862b4ad6dbfd87226a8318b904fbf..7d810cb40efe2e841009392a04b44628856dc94d 100755 (executable)
--- a/utilities/ovs-save
+++ b/utilities/ovs-save
@@ -38,7 +38,7 @@ EOF
 }
 
 save_interfaces () {
-    if (ip -V) > /dev/null 2>&1; then :; else
+    if (ip link show) > /dev/null 2>&1; then :; else
         echo "$0: ip not found in $PATH" >&2
         exit 1
     fi
@@ -110,6 +110,17 @@ save_flows () {
         exit 1
     fi
 
+    # OVS 2.7 and earlier do not enable OpenFlow 1.4 (by default) and lack
+    # other features needed to save and restore flows.  Don't try.
+    case `ovs-appctl version | sed 1q` in
+        "ovs-vswitchd (Open vSwitch) 1."*.*)
+            return
+            ;;
+        "ovs-vswitchd (Open vSwitch) 2."[0-7].*)
+            return
+            ;;
+    esac
+
     workdir=$(mktemp -d "${TMPDIR:-/tmp}/ovs-save.XXXXXXXXXX")
     for bridge in "$@"; do
         # Get the highest enabled OpenFlow version