commit 84582094d974dd171d605d9f973a3b45e95ea8f7
author Andy Bavier <acb@cs.princeton.edu> Tue Sep 01 18:02:28 2015 -0400
committer Andy Bavier <acb@cs.princeton.edu> Tue Sep 01 18:02:28 2015 -0400
tree afe6a1af101f286d2f724c8d77e3edceddd305d8
parent 516be12fa14a37751851c39ae5dc02eed8faaa54

Back out

cloudlab-init.sh

diff --git a/cloudlab-init.sh b/cloudlab-init.sh
index 7df5f68..4eeb071 100755
--- a/cloudlab-init.sh
+++ b/cloudlab-init.sh
@@ -8,10 +8,9 @@
 AUTH="padmin@vicci.org:letmein"
 CORD=0
 IMAGE="xos"
-KEYFILE="~/.ssh/id_rsa"
 
 # Create public key if none present
-[ -e $KEYFILE ] || cat /dev/zero | ssh-keygen -q -N ""
+[ -e ~/.ssh/id_rsa ] || cat /dev/zero | ssh-keygen -q -N ""
 
 # Install Docker
 which docker > /dev/null || wget -qO- https://get.docker.com/ | sh
@@ -21,8 +20,8 @@
 
 if [ "$CORD" -ne 0 ]
 then
-    cp $KEYFILE.pub xos/observers/vcpe/vcpe_public_key
-    cp $KEYFILE     xos/observers/vcpe/vcpe_private_key
+    cp ~/.ssh/id_rsa.pub xos/observers/vcpe/vcpe_public_key
+    cp ~/.ssh/id_rsa     xos/observers/vcpe/vcpe_private_key
 fi
 
 sudo docker build -t xos .
@@ -45,7 +44,7 @@
 
 # Copy public key
 # BUG: Shouldn't have to set the 'enacted' field...
-PUBKEY=$( cat $KEYFILE.pub )
+PUBKEY=$( cat ~/.ssh/id_rsa.pub )
 http --auth $AUTH PATCH $XOS/xos/users/1/ public_key="$PUBKEY" enacted=$( date "+%Y-%m-%dT%T")
 
 # Set up controller