From: Justin Pettit <jpettit@nicira.com>
Date: Mon, 11 Jan 2010 23:20:44 +0000 (-0800)
Subject: debian: Create the config database if it doesn't exist on startup
X-Git-Tag: v1.0.0~259^2~311
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=6b739e5403d718f0798886ab8f86ae5c4118fc05;p=sliver-openvswitch.git

debian: Create the config database if it doesn't exist on startup

On startup, create an empty config database if it doesn't already exist.  This
is the behavior of the XenServer init scripts.
---

diff --git a/debian/openvswitch-switch.init b/debian/openvswitch-switch.init
index de8f295d0..bb2cb1bfe 100755
--- a/debian/openvswitch-switch.init
+++ b/debian/openvswitch-switch.init
@@ -201,6 +201,14 @@ case "$1" in
             check_op "Setting core limit to $CORE_LIMIT" ulimit -c "$CORE_LIMIT"
         fi
 
+        # Create an empty configuration database if it doesn't exist.
+        if test ! -e /etc/openvswitch-switch/conf; then
+            # Create configuration database.
+            ovsdb-tool -vANY:console:emer \
+                create /etc/openvswitch-switch/conf \
+                /usr/share/openvswitch/vswitch-idl.ovsschema
+        fi
+
         # Start ovsdb-server.
         set --
         set -- "$@" --verbose=ANY:console:emer --verbose=ANY:syslog:err
@@ -218,6 +226,8 @@ case "$1" in
             echo " ERROR."
         fi
 
+        ovs-vsctl --no-wait init
+
         # Start ovs-vswitchd.
         set --
         set -- "$@" --verbose=ANY:console:emer --verbose=ANY:syslog:err
diff --git a/debian/openvswitch-switch.postinst b/debian/openvswitch-switch.postinst
index 39b2de461..4be5a30c7 100755
--- a/debian/openvswitch-switch.postinst
+++ b/debian/openvswitch-switch.postinst
@@ -41,19 +41,6 @@ case "$1" in
             running=false
         fi
 
-        if test ! -e /etc/openvswitch-switch/conf; then
-            # Create configuration database.
-            ovsdb-tool -vANY:console:emer \
-                create /etc/openvswitch-switch/conf \
-                /usr/share/openvswitch/vswitch-idl.ovsschema
-
-            # Initialize configuration database.
-            ovsdb-tool -vANY:console:emer \
-                transact /etc/openvswitch-switch/conf \
-                '[{"op": "insert", "table": "Open_vSwitch", "row": {}}]' \
-                > /dev/null
-        fi
-
         if $running; then
             /etc/init.d/openvswitch-switch start
         fi