git://git.onelab.eu
/
sliver-openvswitch.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Prepare for post-2.2.0 (2.2.90).
[sliver-openvswitch.git]
/
utilities
/
ovs-save
diff --git
a/utilities/ovs-save
b/utilities/ovs-save
index
b46f98d
..
73895f3
100755
(executable)
--- a/
utilities/ovs-save
+++ b/
utilities/ovs-save
@@
-33,23
+33,8
@@
This script is meant as a helper for the Open vSwitch init script commands.
EOF
}
EOF
}
-PATH=/sbin:/bin:/usr/sbin:/usr/bin
-
-missing_program () {
- save_IFS=$IFS
- IFS=:
- for dir in $PATH; do
- IFS=$save_IFS
- if test -x $dir/$1; then
- return 1
- fi
- done
- IFS=$save_IFS
- return 0
-}
-
save_interfaces () {
save_interfaces () {
- if
missing_program ip; then
+ if
(ip -V) > /dev/null 2>&1; then :; else
echo "$0: ip not found in $PATH" >&2
exit 1
fi
echo "$0: ip not found in $PATH" >&2
exit 1
fi
@@
-152,18
+137,18
@@
save_interfaces () {
echo
done
echo
done
- if missing_program iptables-save; then
- echo "# iptables-save not found in $PATH, not saving iptables state"
- else
+ if (iptables-save) > /dev/null 2>&1; then
echo "# global"
echo "iptables-restore <<'EOF'"
iptables-save
echo "EOF"
echo "# global"
echo "iptables-restore <<'EOF'"
iptables-save
echo "EOF"
+ else
+ echo "# iptables-save not found in $PATH, not saving iptables state"
fi
}
save_flows () {
fi
}
save_flows () {
- if
missing_program ovs-ofctl; then
+ if
(ovs-ofctl --version) > /dev/null 2>&1; then :; else
echo "$0: ovs-ofctl not found in $PATH" >&2
exit 1
fi
echo "$0: ovs-ofctl not found in $PATH" >&2
exit 1
fi
@@
-182,7
+167,7
@@
ovs_vsctl () {
save_ofports ()
{
save_ofports ()
{
- if
missing_program ovs-vsctl; then
+ if
(ovs-vsctl --version) > /dev/null 2>&1; then :; else
echo "$0: ovs-vsctl not found in $PATH" >&2
exit 1
fi
echo "$0: ovs-vsctl not found in $PATH" >&2
exit 1
fi