From 0ca76e8cd81eae58d2cca6e3c36e320d057d942d Mon Sep 17 00:00:00 2001
From: Luke Faraone <lfaraone@dropbox.com>
Date: Wed, 10 Sep 2014 10:34:10 -0700
Subject: [PATCH] install-server: don't fail if ~root/.ssh already exists

New AMIs install an authorized_keys file that rejects user login.

(imported from commit ad64d0a92e38319b705225a599edfd31a6ba037b)
---
 tools/install-server | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/install-server b/tools/install-server
index 5da2de595f..51b547b646 100755
--- a/tools/install-server
+++ b/tools/install-server
@@ -41,7 +41,7 @@ set +e
 
 ssh $SSH_OPTS "$server" -t -i "$amazon_key_file" -ladmin -o "ControlMaster=no" <<EOF
 sudo sed -i 's/PermitRootLogin no/PermitRootLogin yes/g' /etc/ssh/sshd_config
-sudo mkdir ~root/.ssh && sudo cp .ssh/authorized_keys ~root/.ssh/authorized_keys
+sudo mkdir -p ~root/.ssh && sudo cp .ssh/authorized_keys ~root/.ssh/authorized_keys
 sudo service ssh restart
 
 EOF