diff options
| author | Justin Pettit <jpettit@nicira.com> | 2015-04-12 10:13:59 -0700 |
|---|---|---|
| committer | Justin Pettit <jpettit@nicira.com> | 2015-04-12 10:13:59 -0700 |
| commit | daaeeec0bd4348b1f6ac5ca5a302e57bd11cca01 (patch) | |
| tree | 5b34ccd589c61547044dfbfcf77636bfcd8ebb61 /tutorial | |
| parent | 717c7fc508044d08210c686c1e8576c29a108f86 (diff) | |
| parent | e8fe6ad03aa3d25b5ae99190d5aa065705a1b3c8 (diff) | |
| download | openvswitch-daaeeec0bd4348b1f6ac5ca5a302e57bd11cca01.tar.gz | |
Merge remote-tracking branch 'origin/master' into ovn
Conflicts:
tutorial/ovs-sandbox
Diffstat (limited to 'tutorial')
| -rwxr-xr-x | tutorial/ovs-sandbox | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/tutorial/ovs-sandbox b/tutorial/ovs-sandbox index 9e8ead004..133585e49 100755 --- a/tutorial/ovs-sandbox +++ b/tutorial/ovs-sandbox @@ -1,6 +1,6 @@ #! /bin/sh # -# Copyright (c) 2013 Nicira, Inc. +# Copyright (c) 2013, 2015 Nicira, Inc. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -36,7 +36,7 @@ rungdb() { 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 + run_xterm $xterm_title gdb -ex run --args $args else run $@ fi @@ -279,6 +279,9 @@ fi rungdb $gdb_ovsdb ovsdb-server --detach --no-chdir --pidfile -vconsole:off --log-file \ --remote=punix:"$sandbox"/db.sock $ovsdb_server_args +# Initialize database. +run ovs-vsctl --no-wait -- init + # Start ovs-vswitchd. rungdb $gdb_vswitchd ovs-vswitchd --detach --no-chdir --pidfile -vconsole:off --log-file \ --enable-dummy=override -vvconn -vnetdev_dummy |