From 2c6bcfa2612e41713b8039f22cf949e8e9344563 Mon Sep 17 00:00:00 2001
From: Russell Bryant <rbryant@redhat.com>
Date: Fri, 15 May 2015 11:03:08 -0400
Subject: ovs-sandbox: Fix ovn support.

The last merge from master broke ovs-sandbox OVN support.  The rungdb
function now takes an additional argument for whether or not the
daemon should be automatically started under gdb.

Signed-off-by: Russell Bryant <rbryant@redhat.com>
Signed-off-by: Ben Pfaff <blp@nicira.com>
---
 tutorial/ovs-sandbox | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

(limited to 'tutorial')

diff --git a/tutorial/ovs-sandbox b/tutorial/ovs-sandbox
index 02145de44..e2bca9cf4 100755
--- a/tutorial/ovs-sandbox
+++ b/tutorial/ovs-sandbox
@@ -56,7 +56,9 @@ gdb_ovsdb=false
 gdb_vswitchd_ex=false
 gdb_ovsdb_ex=false
 gdb_ovn_northd=false
+gdb_ovn_northd_ex=false
 gdb_ovn_controller=false
+gdb_ovn_controller_ex=false
 builddir=
 srcdir=
 schema=
@@ -107,6 +109,8 @@ These options force ovs-sandbox to use an installed Open vSwitch:
   -d, --gdb-ovsdb      run ovsdb-server under gdb
   --gdb-ovn-northd     run ovn-northd under gdb
   --gdb-ovn-controller run ovn-controller under gdb
+  -R, --gdb-run        automatically start running the daemon in gdb
+                       for any daemon set to run under gdb
   -S, --schema=FILE    use FILE as vswitch.ovsschema
   -o, --ovn            enable OVN
 
@@ -168,6 +172,12 @@ EOF
         -o|--ovn)
             ovn=true
             ;;
+        -R|--gdb-run)
+            gdb_vswitchd_ex=true
+            gdb_ovsdb_ex=true
+            gdb_ovn_northd_ex=true
+            gdb_ovn_controller_ex=true
+            ;;
         -*)
             echo "unrecognized option $option (use --help for help)" >&2
             exit 1
@@ -327,8 +337,8 @@ if $ovn; then
     ovs-vsctl add-br br-int \
         -- set bridge br-int fail-mode=secure other-config:disable-in-band=true
 
-    rungdb $gdb_ovn_northd ovn-northd --detach --no-chdir --pidfile -vconsole:off --log-file
-    rungdb $gdb_ovn_controller ovn-controller --detach --no-chdir --pidfile -vconsole:off --log-file
+    rungdb $gdb_ovn_northd $gdb_ovn_northd_ex ovn-northd --detach --no-chdir --pidfile -vconsole:off --log-file
+    rungdb $gdb_ovn_controller $gdb_ovn_controller_ex ovn-controller --detach --no-chdir --pidfile -vconsole:off --log-file
 fi
 
 cat <<EOF
-- 
cgit v1.2.1