From be3a025491678c23f73194661fc5d6258853d8c0 Mon Sep 17 00:00:00 2001
From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com>
Date: Mon, 22 Jul 2019 16:32:25 -0700
Subject: [PATCH] Do not attempt to create solana user multiple times (#5228)
 (#5233)

* Do not attempt to create solana user multiple times

(cherry picked from commit 21cef2fe21cfbd8319359c7a7fac7b4b2dd11952)
---
 net/scripts/create-solana-user.sh | 45 ++++++++++++++++---------------
 1 file changed, 24 insertions(+), 21 deletions(-)

diff --git a/net/scripts/create-solana-user.sh b/net/scripts/create-solana-user.sh
index 0978df4934..59a50abd11 100755
--- a/net/scripts/create-solana-user.sh
+++ b/net/scripts/create-solana-user.sh
@@ -4,26 +4,29 @@ set -ex
 [[ $(uname) = Linux ]] || exit 1
 [[ $USER = root ]] || exit 1
 
-adduser solana --gecos "" --disabled-password --quiet
-adduser solana sudo
-adduser solana adm
-echo "solana ALL=(ALL) NOPASSWD:ALL" >> /etc/sudoers
-id solana
+if grep -q solana /etc/passwd ; then
+  echo "User solana already exists"
+else
+  adduser solana --gecos "" --disabled-password --quiet
+  adduser solana sudo
+  adduser solana adm
+  echo "solana ALL=(ALL) NOPASSWD:ALL" >> /etc/sudoers
+  id solana
 
-[[ -r /solana-id_ecdsa ]] || exit 1
-[[ -r /solana-id_ecdsa.pub ]] || exit 1
-
-sudo -u solana bash -c "
-  mkdir -p /home/solana/.ssh/
-  cd /home/solana/.ssh/
-  cp /solana-id_ecdsa.pub authorized_keys
-  umask 377
-  cp /solana-id_ecdsa id_ecdsa
-  echo \"
-    Host *
-    BatchMode yes
-    IdentityFile ~/.ssh/id_ecdsa
-    StrictHostKeyChecking no
-  \" > config
-"
+  [[ -r /solana-id_ecdsa ]] || exit 1
+  [[ -r /solana-id_ecdsa.pub ]] || exit 1
 
+  sudo -u solana bash -c "
+    mkdir -p /home/solana/.ssh/
+    cd /home/solana/.ssh/
+    cp /solana-id_ecdsa.pub authorized_keys
+    umask 377
+    cp /solana-id_ecdsa id_ecdsa
+    echo \"
+      Host *
+      BatchMode yes
+      IdentityFile ~/.ssh/id_ecdsa
+      StrictHostKeyChecking no
+    \" > config
+  "
+fi