projects
/
openvswitch
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
datapath: Use __read_mostly annotations where appropriate.
[openvswitch]
/
xenserver
/
etc_init.d_openvswitch
diff --git
a/xenserver/etc_init.d_openvswitch
b/xenserver/etc_init.d_openvswitch
index 68079fcf524d1f20409d8d058002a0c36247882d..5f18196cf8342008eced5b8d002fc308704a07bd 100755
(executable)
--- a/
xenserver/etc_init.d_openvswitch
+++ b/
xenserver/etc_init.d_openvswitch
@@
-117,6
+117,12
@@
else
monitor_opt=
fi
monitor_opt=
fi
+function hup_monitor_external_ids {
+ if [ -e /var/run/openvswitch/ovs-external-ids.pid ]; then
+ action "Configuring Open vSwitch external IDs" kill -HUP `cat /var/run/openvswitch/ovs-external-ids.pid`
+ fi
+}
+
function dp_list {
"$dpctl" show | grep '^dp[0-9]\+:' | cut -d':' -f 1
}
function dp_list {
"$dpctl" show | grep '^dp[0-9]\+:' | cut -d':' -f 1
}
@@
-346,8
+352,8
@@
function start {
# Start daemon to monitor external ids
PYTHONPATH=/usr/share/openvswitch/python \
# Start daemon to monitor external ids
PYTHONPATH=/usr/share/openvswitch/python \
- /usr/share/openvswitch/scripts/
monitor
-external-ids \
- --pidfile --detach "$VSWITCHD_OVSDB_SERVER"
+ /usr/share/openvswitch/scripts/
ovs
-external-ids \
+ --pidfile --detach
$monitor_opt
"$VSWITCHD_OVSDB_SERVER"
touch /var/lock/subsys/openvswitch
}
touch /var/lock/subsys/openvswitch
}
@@
-356,8
+362,8
@@
function stop {
stop_daemon BRCOMPATD "$brcompatd"
stop_daemon VSWITCHD "$vswitchd"
stop_daemon OVSDB_SERVER "$ovsdb_server"
stop_daemon BRCOMPATD "$brcompatd"
stop_daemon VSWITCHD "$vswitchd"
stop_daemon OVSDB_SERVER "$ovsdb_server"
- if [ -e /var/run/openvswitch/
monitor
-external-ids.pid ]; then
- kill `cat /var/run/openvswitch/
monitor
-external-ids.pid`
+ if [ -e /var/run/openvswitch/
ovs
-external-ids.pid ]; then
+ kill `cat /var/run/openvswitch/
ovs
-external-ids.pid`
fi
rm -f /var/lock/subsys/openvswitch
}
fi
rm -f /var/lock/subsys/openvswitch
}
@@
-380,8
+386,10
@@
case "$1" in
restart
;;
reload|force-reload)
restart
;;
reload|force-reload)
- # Nothing to do--ovs-vswitchd and ovsdb-server keep their configuration
- # up-to-date all the time.
+ # Nothing to do to ovs-vswitchd and ovsdb-server as they keep their
+ # configuration up-to-date all the time. HUP ovs-external-ids so it
+ # re-runs.
+ hup_monitor_external_ids
;;
strace-vswitchd)
shift
;;
strace-vswitchd)
shift