From 1369720c6ce1a7117bff8f8fcc8f76f0808f1fcd Mon Sep 17 00:00:00 2001 From: Justin Pettit Date: Wed, 8 Apr 2015 22:51:10 -0700 Subject: ovs-sandbox: Use new ovn-sb database name. Commit ec78987 (ovn: Rename "ovn" database to "ovn-sb".) changed the name of the database, but didn't update ovs-sandbox to use this new name. Signed-off-by: Justin Pettit Acked-by: Russell Bryant --- tutorial/ovs-sandbox | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'tutorial') diff --git a/tutorial/ovs-sandbox b/tutorial/ovs-sandbox index 4e0bd4d99..c299de073 100755 --- a/tutorial/ovs-sandbox +++ b/tutorial/ovs-sandbox @@ -51,8 +51,8 @@ schema= installed=false built=false ovn=false -ovnschema= -ovnnbschema= +ovnsb_schema= +ovnnb_schema= for option; do # This option-parsing mechanism borrowed from a Autoconf-generated @@ -193,13 +193,13 @@ if $built; then exit 1 fi if $ovn; then - ovnschema=$srcdir/ovn/ovn.ovsschema - if test ! -e "$ovnschema"; then + ovnsb_schema=$srcdir/ovn/ovn-sb.ovsschema + if test ! -e "$ovnsb_schema"; then echo >&2 'source directory not found, please use --srcdir' exit 1 fi - ovnnbschema=$srcdir/ovn/ovn-nb.ovsschema - if test ! -e "$ovnnbschema"; then + ovnnb_schema=$srcdir/ovn/ovn-nb.ovsschema + if test ! -e "$ovnnb_schema"; then echo >&2 'source directory not found, please use --srcdir' exit 1 fi @@ -265,11 +265,11 @@ touch "$sandbox"/.conf.db.~lock~ run ovsdb-tool create conf.db "$schema" ovsdb_server_args= if $ovn; then - touch "$sandbox"/.ovn.db.~lock~ + touch "$sandbox"/.ovnsb.db.~lock~ touch "$sandbox"/.ovnnb.db.~lock~ - run ovsdb-tool create ovn.db "$ovnschema" - run ovsdb-tool create ovnnb.db "$ovnnbschema" - ovsdb_server_args="ovn.db ovnnb.db conf.db" + run ovsdb-tool create ovnsb.db "$ovnsb_schema" + run ovsdb-tool create ovnnb.db "$ovnnb_schema" + ovsdb_server_args="ovnsb.db ovnnb.db conf.db" fi rungdb $gdb_ovsdb ovsdb-server --detach --no-chdir --pidfile -vconsole:off --log-file \ --remote=punix:"$sandbox"/db.sock $ovsdb_server_args -- cgit v1.2.1