diff options
| author | Simon Horman <horms@verge.net.au> | 2010-10-14 07:18:20 +0900 |
|---|---|---|
| committer | Ben Pfaff <blp@nicira.com> | 2010-10-13 15:22:13 -0700 |
| commit | f3c51ad9cc6cbd87ef726a4b33e39bb9d6d24769 (patch) | |
| tree | 3909a6d6026da3546d47bb267625acb835acbdd1 /debian | |
| parent | 65d9664a0f0199ac21e12eb73f734af3588ef5fd (diff) | |
| download | openvswitch-f3c51ad9cc6cbd87ef726a4b33e39bb9d6d24769.tar.gz | |
debian: Make the init script's start command idempotent
Signed-off-by: Simon Horman <horms@verge.net.au>
Signed-off-by: Ben Pfaff <blp@nicira.com>
Diffstat (limited to 'debian')
| -rwxr-xr-x | debian/openvswitch-switch.init | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/debian/openvswitch-switch.init b/debian/openvswitch-switch.init index 0907cdf7c..871ac2d4f 100755 --- a/debian/openvswitch-switch.init +++ b/debian/openvswitch-switch.init @@ -209,7 +209,7 @@ case "$1" in ovsdb-tool -vANY:console:emer \ create /etc/openvswitch/conf.db \ /usr/share/openvswitch/vswitch.ovsschema - else + elif ! running ovsdb-server; then # Upgrade or downgrade schema and compact database. ovsdb-tool -vANY:console:emer \ convert /etc/openvswitch/conf.db \ @@ -247,7 +247,7 @@ case "$1" in set -- "$@" --bootstrap-ca-cert=db:SSL,ca_cert set -- "$@" $OVSDB_SERVER_OPTS echo -n "Starting ovsdb-server: " - start-stop-daemon --start --quiet \ + start-stop-daemon --start --quiet --oknodo \ --pidfile /var/run/openvswitch/ovsdb-server.pid \ --chdir /var/log/openvswitch/cores \ --exec $ovsdb_server -- "$@" @@ -267,7 +267,7 @@ case "$1" in set -- "$@" unix:/var/run/openvswitch/db.sock set -- "$@" $OVS_VSWITCHD_OPTS echo -n "Starting ovs-vswitchd: " - start-stop-daemon --start --quiet \ + start-stop-daemon --start --quiet --oknodo \ --pidfile /var/run/openvswitch/ovs-vswitchd.pid \ --chdir /var/log/openvswitch/cores \ --exec $ovs_vswitchd -- "$@" |