python/ovs/socket_util: Fix error path in set_nonblocking.

[openvswitch] / debian / openvswitch-controller.init

diff --git a/debian/openvswitch-controller.init b/debian/openvswitch-controller.init
index 4781f83f2148c747ed5c50f25931ec1165875100..b073ddef07c8265ca0ff45864c98b86aac3374f9 100755 (executable)
--- a/debian/openvswitch-controller.init
+++ b/debian/openvswitch-controller.init
@@ -1,5 +1,6 @@
 #!/bin/sh
 #
+# Copyright (c) 2011 Nicira, Inc.
 # Copyright (c) 2007, 2009 Javier Fernandez-Sanguino <jfs@debian.org>
 #
 # This is free software; you may redistribute it and/or modify
@@ -26,11 +27,13 @@
 # Default-Start:     2 3 4 5
 # Default-Stop:      0 1 6
 # Short-Description: Open vSwitch controller
+# Description:       The Open vSwitch controller enables OpenFlow switches that connect to it
+#                    to act as MAC-learning Ethernet switches.
 ### END INIT INFO
 
 PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
 
-DAEMON=/usr/sbin/ovs-controller # Introduce the server's location here
+DAEMON=/usr/bin/ovs-controller # Introduce the server's location here
 NAME=ovs-controller         # Introduce the short server's name here
 DESC=ovs-controller         # Introduce a short description here
 LOGDIR=/var/log/openvswitch # Log directory to use
@@ -105,6 +108,10 @@ start_server() {
         exit 0
     fi
 
+    if [ ! -d /var/run/openvswitch ]; then
+        install -d -m 755 -o root -g root /var/run/openvswitch
+    fi
+
     SSL_OPTS=
     case $LISTEN in
         *ssl*)