Merge lp:~lynxman/ubuntu/oneiric/openvswitch/fixinitupstream into lp:ubuntu/oneiric/openvswitch

[Marc Cluet]

* Fix on openvswitch-controller.init (LP: #822142)
  - Make sure we have a directory under /var/run to create the
    pidfile for openvswitch-controller, backported from upstream

[Felix Geyer (debfx)]

Merged, thanks!

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2011-08-04 17:03:23 +0000
+++ debian/changelog	2011-08-24 23:51:28 +0000
@@ -1,3 +1,11 @@
+openvswitch (1.2.0-1ubuntu2) oneiric; urgency=low
+
+  * Fix on openvswitch-controller.init (LP: #822142)
+    - Make sure we have a directory under /var/run to create the
+      pidfile for openvswitch-controller, backported from upstream
+
+ -- Marc Cluet <[e-mail]>  Tue, 23 Aug 2011 16:07:49 +0100
+
 openvswitch (1.2.0-1ubuntu1) oneiric; urgency=low
 
   * Merge from debian unstable.  Remaining changes:

=== modified file 'debian/openvswitch-controller.init'
--- debian/openvswitch-controller.init	2011-01-06 11:11:55 +0000
+++ debian/openvswitch-controller.init	2011-08-24 23:51:28 +0000
@@ -1,5 +1,6 @@
 #!/bin/sh
 #
+# Copyright (c) 2011 Nicira Networks Inc.
 # Copyright (c) 2007, 2009 Javier Fernandez-Sanguino <[e-mail]>
 #
 # This is free software; you may redistribute it and/or modify
@@ -105,6 +106,10 @@
         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*)