홍길동 / onos

Go to a project
Toggle navigation Toggle navigation pinning
Bob Lantz
Committed by Gerrit Code Review
e7b43039 1 parent 54526b48

Previously we were unsetting ONOS_USER and then checking whether 

it was set, which doesn't make sense. The intent seems to be
to set a default and to respect existing settings of ONOS_USER,
and probably ONOS_GROUP as well.

Change-Id: I80dcbc2ccd80791c76b2497fd1da317765a6e66f
Inline Side-by-side
Showing 1 changed file with 2 additions and 1 deletions
...@@ -110,9 +110,10 @@ function cell { ...@@ -110,9 +110,10 @@ function cell {
110 [ ! -f $ONOS_ROOT/tools/test/cells/$1 ] && \ 110 [ ! -f $ONOS_ROOT/tools/test/cells/$1 ] && \
111 echo "No such cell: $1" >&2 && return 1 111 echo "No such cell: $1" >&2 && return 1
112 unset ONOS_CELL ONOS_NIC ONOS_IP ONOS_APPS ONOS_BOOT_FEATURES 112 unset ONOS_CELL ONOS_NIC ONOS_IP ONOS_APPS ONOS_BOOT_FEATURES
113 - unset OCI OCN OCT ONOS_INSTANCES ONOS_USER ONOS_GROUP ONOS_FEATURES 113 + unset OCI OCN OCT ONOS_INSTANCES ONOS_FEATURES ONOS_USER ONOS_GROUP
114 unset $(env | sed -n 's:\(^OC[0-9]\{1,\}\)=.*:\1 :g p') 114 unset $(env | sed -n 's:\(^OC[0-9]\{1,\}\)=.*:\1 :g p')
115 export ONOS_USER=${ONOS_USER:-sdn} 115 export ONOS_USER=${ONOS_USER:-sdn}
116 + export ONOS_GROUP=${ONOS_GROUP:-sdn}
116 export ONOS_WEB_USER=onos 117 export ONOS_WEB_USER=onos
117 export ONOS_WEB_PASS=rocks 118 export ONOS_WEB_PASS=rocks
118 export ONOS_CELL=$1 119 export ONOS_CELL=$1
......