projects
/
openvswitch
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix force-reload-kmod initscript command implementations.
[openvswitch]
/
debian
/
openvswitch-switch.init
diff --git
a/debian/openvswitch-switch.init
b/debian/openvswitch-switch.init
index 9c7343b3fc5eb7c082f01122abfa1d545021ae13..a65af0ce1546c52368b769bf1867ad9cb6153134 100755
(executable)
--- a/
debian/openvswitch-switch.init
+++ b/
debian/openvswitch-switch.init
@@
-25,38
+25,48
@@
(test -x /usr/sbin/ovs-vswitchd && test -x /usr/bin/ovsdb-server) || exit 0
(test -x /usr/sbin/ovs-vswitchd && test -x /usr/bin/ovsdb-server) || exit 0
-set -e
-
test -e /etc/default/openvswitch-switch && . /etc/default/openvswitch-switch
ovs_ctl=/usr/share/openvswitch/scripts/ovs-ctl
test -e /etc/default/openvswitch-switch && . /etc/default/openvswitch-switch
ovs_ctl=/usr/share/openvswitch/scripts/ovs-ctl
-case $1 in
- start)
- set $ovs_ctl start --system-id=random
- if test X"$FORCE_COREFILES" != X; then
- set "$@" --force-corefiles="$FORCE_COREFILES"
- fi
- # Allow GRE traffic.
- test ! -x /sbin/iptables || /sbin/iptables -I INPUT -p gre -j ACCEPT
+start () {
+ set $ovs_ctl ${1-start} --system-id=random
+ if test X"$FORCE_COREFILES" != X; then
+ set "$@" --force-corefiles="$FORCE_COREFILES"
+ fi
- "$@"
- ;;
+ # Allow GRE traffic.
+ test ! -x /sbin/iptables || /sbin/iptables -I INPUT -p gre -j ACCEPT
+
+ "$@"
+}
+
+stop () {
+ $ovs_ctl stop
+}
+
+case $1 in
+ start)
+ start
+ ;;
stop | force-stop)
stop | force-stop)
-
$ovs_ctl
stop
+ stop
;;
reload | force-reload)
# The OVS daemons keep up-to-date.
;;
restart)
;;
reload | force-reload)
# The OVS daemons keep up-to-date.
;;
restart)
- $0 stop || true
-
$0
start
+ stop
+ start
;;
status)
$ovs_ctl status
;;
;;
status)
$ovs_ctl status
;;
+ force-reload-kmod)
+ start force-reload-kmod
+ ;;
*)
*)
- echo "Usage: $0 {start|stop|restart|force-reload|status|force-stop}" >&2
+ echo "Usage: $0 {start|stop|restart|force-reload|status|force-stop
|force-reload-kmod
}" >&2
exit 1
;;
esac
exit 1
;;
esac