Update ovs-sandbox to run ovn-nbd when it is run with OVN enabled. In
passing, also fix the indentation of two lines to use spaces instead
of tabs.
Signed-off-by: Russell Bryant <rbryant@redhat.com>
Signed-off-by: Ben Pfaff <blp@nicira.com>
# Use "DISPLAY" variable to determine out if X is supported
if $under_gdb && [ "$DISPLAY" ]; then
args=`echo $@ |sed s/--detach//g | sed s/--vconsole:off//g`
# Use "DISPLAY" variable to determine out if X is supported
if $under_gdb && [ "$DISPLAY" ]; then
args=`echo $@ |sed s/--detach//g | sed s/--vconsole:off//g`
- xterm_title=$1
- run_xterm $xterm_title gdb --args $args
+ xterm_title=$1
+ run_xterm $xterm_title gdb --args $args
gdb_vswitchd=false
gdb_ovsdb=false
gdb_vswitchd=false
gdb_ovsdb=false
builddir=
srcdir=
schema=
builddir=
srcdir=
schema=
-i, --installed use installed Open vSwitch
-g, --gdb-vswitchd run ovs-vswitchd under gdb
-d, --gdb-ovsdb run ovsdb-server under gdb
-i, --installed use installed Open vSwitch
-g, --gdb-vswitchd run ovs-vswitchd under gdb
-d, --gdb-ovsdb run ovsdb-server under gdb
+ --gdb-ovn-nbd run ovn-nbd under gdb
-S, --schema=FILE use FILE as vswitch.ovsschema
-o, --ovn enable OVN
-S, --schema=FILE use FILE as vswitch.ovsschema
-o, --ovn enable OVN
-g|--gdb-v*)
gdb_vswitchd=true
;;
-g|--gdb-v*)
gdb_vswitchd=true
;;
+ --gdb-ovn-nbd)
+ gdb_ovn_nbd=true
+ ;;
rungdb $gdb_vswitchd ovs-vswitchd --detach --no-chdir --pidfile -vconsole:off --log-file \
--enable-dummy=override -vvconn -vnetdev_dummy
rungdb $gdb_vswitchd ovs-vswitchd --detach --no-chdir --pidfile -vconsole:off --log-file \
--enable-dummy=override -vvconn -vnetdev_dummy
+if $ovn; then
+ rungdb $gdb_ovn_nbd ovn-nbd --detach --no-chdir --pidfile -vconsole:off --log-file
+fi
+