Previously, we would null the variables holding the names of the restore
scripts in case there were any errors in creating the restore script or if
we did not need to run a particular restore script. That is not necessary,
as we can just check the execution permission set on those scirpts.
Also, carve out a couple of functions which will be used in the next commit.
Signed-off-by: Gurucharan Shetty <gshetty@nicira.com>
chmod +x "$2"
return 0
fi
chmod +x "$2"
return 0
fi
[ -z "${bridges}" ] && return 0
}
[ -z "${bridges}" ] && return 0
}
case `ovs-appctl version | sed 1q` in
"ovs-vswitchd (Open vSwitch) 1."[0-9].*)
action "Saving ofport values" ovs_save save-ofports \
case `ovs-appctl version | sed 1q` in
"ovs-vswitchd (Open vSwitch) 1."[0-9].*)
action "Saving ofport values" ovs_save save-ofports \
- "${script_ofports}" script_ofports
- [ -n "${script_ofports}" ] && \
+ [ -x "${script_ofports}" ] && \
action "Restoring ofport values" "${script_ofports}"
}
restore_flows () {
action "Restoring ofport values" "${script_ofports}"
}
restore_flows () {
- [ -n "${script_flows}" ] && \
+ [ -x "${script_flows}" ] && \
action "Restoring saved flows" "${script_flows}"
}
action "Restoring saved flows" "${script_flows}"
}
-force_reload_kmod () {
- ifaces=`internal_interfaces`
- action "Detected internal interfaces: $ifaces" true
+restore_interfaces () {
+ [ ! -x "${script_interfaces}" ] && return 0
+ action "Restoring interface configuration" "${script_interfaces}"
+ rc=$?
+ if test $rc = 0; then
+ level=debug
+ else
+ level=err
+ fi
+ log="logger -p daemon.$level -t ovs-save"
+ $log "force-reload-kmod interface restore script exited with status $rc:"
+ $log -f "$script_interfaces"
+}
+init_restore_scripts () {
script_interfaces=`mktemp`
script_flows=`mktemp`
script_ofports=`mktemp`
trap 'rm -f "${script_interfaces}" "${script_flows}" "${script_ofports}"' 0
script_interfaces=`mktemp`
script_flows=`mktemp`
script_ofports=`mktemp`
trap 'rm -f "${script_interfaces}" "${script_flows}" "${script_ofports}"' 0
- action "Saving flows" ovs_save save-flows "${script_flows}" script_flows
+force_reload_kmod () {
+ ifaces=`internal_interfaces`
+ action "Detected internal interfaces: $ifaces" true
+
+ init_restore_scripts
+
+ action "Saving flows" ovs_save save-flows "${script_flows}"
- action "Restoring interface configuration" "$script_interfaces"
- rc=$?
- if test $rc = 0; then
- level=debug
- else
- level=err
- fi
- log="logger -p daemon.$level -t ovs-save"
- $log "force-reload-kmod interface restore script exited with status $rc:"
- $log -f "$script_interfaces"
"$datadir/scripts/ovs-check-dead-ifs"
}
"$datadir/scripts/ovs-check-dead-ifs"
}