commit 69450892a6de1f5405a731550ac48bace84299e4
author Yuta HIGUCHI <y-higuchi@onlab.us> Wed Apr 16 09:10:55 2014 -0700
committer Gerrit Code Review <gerrit2@onos-services> Wed Apr 16 09:17:44 2014 -0700
tree b1eb31112924c0cedd5a775be1bbcfe193795bc9
parent 0a9d5c3d95fea554622513619ede99e614735ed8

Removed sudo command from onos.sh.

- Extracted onos.sh fix part from Naoki's patch:
  https://gerrit.onos.onlab.us/483

Change-Id: Ifdc6da56b56a069892dac65fc50fbc663b5d0faa

onos.sh

diff --git a/onos.sh b/onos.sh
index 9ab7f91..d10f907 100755
--- a/onos.sh
+++ b/onos.sh
@@ -260,9 +260,18 @@
     revert-confs "[ERROR in ${filename}] zookeeper.hosts must have hostname \"${ONOS_HOST_NAME}\""
   fi
   
-  # TODO: Remove sudo.
-  # This is temporary code for the sake of compatibility with old code (which creates myid with root user).
-  sudo mv ${ZK_MY_ID} ${ZK_MY_ID}.old
+  if [ -f "${ZK_MY_ID}" ]; then
+    local SUDO=${SUDO:-}
+    {
+      ${SUDO} mv -f ${ZK_MY_ID} ${ZK_MY_ID}.old
+    } || {
+      echo "FAILED"
+      echo "[ERROR] Failed to rename ${ZK_MY_ID}."
+      echo "[ERROR] Please retry after setting \"export SUDO=sudo\""
+      exit 1
+    }
+  fi
+  
   echo ${myid} > ${ZK_MY_ID}
   
   echo -n "myid is assigned to ${myid} ... "