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
xenserver, rhel, debian: Use ovs-ctl restart.
[sliver-openvswitch.git]
/
debian
/
openvswitch-switch.init
diff --git
a/debian/openvswitch-switch.init
b/debian/openvswitch-switch.init
index
cb9670c
..
301bc73
100755
(executable)
--- a/
debian/openvswitch-switch.init
+++ b/
debian/openvswitch-switch.init
@@
-1,6
+1,6
@@
#! /bin/sh
#
#! /bin/sh
#
-# Copyright (C) 2011, 2012 Nicira
Networks
, Inc.
+# Copyright (C) 2011, 2012 Nicira, Inc.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@
-21,6
+21,8
@@
# Default-Start: 2 3 4 5
# Default-Stop: 0 1 6
# Short-Description: Open vSwitch switch
# Default-Start: 2 3 4 5
# Default-Stop: 0 1 6
# Short-Description: Open vSwitch switch
+# Description: openvswitch-switch provides the userspace components and utilities for
+# the Open vSwitch kernel-based switch.
### END INIT INFO
(test -x /usr/sbin/ovs-vswitchd && test -x /usr/sbin/ovsdb-server) || exit 0
### END INIT INFO
(test -x /usr/sbin/ovs-vswitchd && test -x /usr/sbin/ovsdb-server) || exit 0
@@
-56,20
+58,37
@@
start () {
echo "For instructions, read"
fi
echo "/usr/share/doc/openvswitch-datapath-source/README.Debian"
echo "For instructions, read"
fi
echo "/usr/share/doc/openvswitch-datapath-source/README.Debian"
+
+ if test X"$OVS_MISSING_KMOD_OK" = Xyes; then
+ # We're being invoked by the package postinst. Do not
+ # fail package installation just because the kernel module
+ # is not available.
+ exit 0
+ fi
fi
set ovs_ctl ${1-start} --system-id=random
if test X"$FORCE_COREFILES" != X; then
set "$@" --force-corefiles="$FORCE_COREFILES"
fi
fi
set ovs_ctl ${1-start} --system-id=random
if test X"$FORCE_COREFILES" != X; then
set "$@" --force-corefiles="$FORCE_COREFILES"
fi
+ set "$@" $OVS_CTL_OPTS
"$@" || exit $?
"$@" || exit $?
-
- ovs_ctl --protocol=gre enable-protocol
}
stop () {
ovs_ctl stop
}
}
stop () {
ovs_ctl stop
}
+restart () {
+ # OVS_RESTART_SAVE_FLOWS can be set by package postinst script.
+ if [ "$OVS_RESTART_SAVE_FLOWS" = "yes" ] || \
+ [ "$1" = "--save-flows=yes" ]; then
+ start restart
+ else
+ stop
+ start
+ fi
+}
+
case $1 in
start)
start
case $1 in
start)
start
@@
-81,8
+100,8
@@
case $1 in
# The OVS daemons keep up-to-date.
;;
restart)
# The OVS daemons keep up-to-date.
;;
restart)
- s
top
- start
+ s
hift
+ restart "$@"
;;
status)
ovs_ctl status
;;
status)
ovs_ctl status