projects
/
openvswitch
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
FAQ: Patch ports are not targeted for upstream.
[openvswitch]
/
debian
/
openvswitch-switch.init
diff --git
a/debian/openvswitch-switch.init
b/debian/openvswitch-switch.init
index 3d187a05642dbf266a5e40485c436761ee95db1f..3c937205599bc00fbcca3195d73b8cbae07ef466 100755
(executable)
--- a/
debian/openvswitch-switch.init
+++ b/
debian/openvswitch-switch.init
@@
-1,6
+1,6
@@
#! /bin/sh
#
#! /bin/sh
#
-# Copyright (C) 2011
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,11
+21,13
@@
# 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
-. /usr/share/openvswitch/scripts/ovs-lib
.sh
+. /usr/share/openvswitch/scripts/ovs-lib
test -e /etc/default/openvswitch-switch && . /etc/default/openvswitch-switch
if test X"$BRCOMPAT" = Xyes && test ! -x /usr/sbin/ovs-brcompatd; then
test -e /etc/default/openvswitch-switch && . /etc/default/openvswitch-switch
if test X"$BRCOMPAT" = Xyes && test ! -x /usr/sbin/ovs-brcompatd; then
@@
-56,11
+58,19
@@
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 $?
ovs_ctl --protocol=gre enable-protocol
"$@" || exit $?
ovs_ctl --protocol=gre enable-protocol
@@
-86,6
+96,7
@@
case $1 in
;;
status)
ovs_ctl status
;;
status)
ovs_ctl status
+ exit $?
;;
force-reload-kmod)
start force-reload-kmod
;;
force-reload-kmod)
start force-reload-kmod