projects
/
cascardo
/
ovs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ovs-ctl: do not attempt to restore flows when called with --delete-bridges
[cascardo/ovs.git]
/
utilities
/
ovs-ctl.in
diff --git
a/utilities/ovs-ctl.in
b/utilities/ovs-ctl.in
index
99d789c
..
918be2c
100755
(executable)
--- a/
utilities/ovs-ctl.in
+++ b/
utilities/ovs-ctl.in
@@
-322,6
+322,12
@@
save_ofports_if_required () {
esac
}
esac
}
+save_flows_if_required () {
+ if test X"$DELETE_BRIDGES" != Xyes; then
+ action "Saving flows" ovs_save save-flows "${script_flows}"
+ fi
+}
+
save_interfaces () {
"$datadir/scripts/ovs-save" save-interfaces ${ifaces} \
> "${script_interfaces}"
save_interfaces () {
"$datadir/scripts/ovs-save" save-interfaces ${ifaces} \
> "${script_interfaces}"
@@
-372,9
+378,7
@@
force_reload_kmod () {
action "Detected internal interfaces: $ifaces" true
init_restore_scripts
action "Detected internal interfaces: $ifaces" true
init_restore_scripts
-
- action "Saving flows" ovs_save save-flows "${script_flows}"
-
+ save_flows_if_required
save_ofports_if_required
# Restart the database first, since a large database may take a
save_ofports_if_required
# Restart the database first, since a large database may take a
@@
-450,7
+454,7
@@
restart () {
if daemon_is_running ovsdb-server && daemon_is_running ovs-vswitchd; then
init_restore_scripts
save_interfaces_if_required
if daemon_is_running ovsdb-server && daemon_is_running ovs-vswitchd; then
init_restore_scripts
save_interfaces_if_required
- action "Saving flows" ovs_save save-flows "${script_flows}"
+ save_flows_if_required
save_ofports_if_required
fi
save_ofports_if_required
fi