From 24574a3205052c9545814a7b4a5c4abd94c13def Mon Sep 17 00:00:00 2001
From: Jack Ivanov <17044561+jackivanov@users.noreply.github.com>
Date: Wed, 15 Jan 2020 21:27:29 +0100
Subject: [PATCH] apt locking fixes (#1685)

---
 files/cloud-init/base.sh | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/files/cloud-init/base.sh b/files/cloud-init/base.sh
index 1898384..414a222 100644
--- a/files/cloud-init/base.sh
+++ b/files/cloud-init/base.sh
@@ -1,10 +1,13 @@
 #!/bin/bash
 set -eux
 
-apt-get update -y
-apt-get install sudo -y
+which sudo || until \
+  apt-get update -y && \
+  apt-get install sudo -yf --install-suggests; do
+  sleep 3
+done
 
-getent passwd algo || useradd -m -d /home/algo -s /bin/bash -G adm,netdev -p '!' algo
+getent passwd algo || useradd -m -d /home/algo -s /bin/bash -G adm -p '!' algo
 
 (umask 337 && echo "algo ALL=(ALL) NOPASSWD:ALL" >/etc/sudoers.d/10-algo-user)
 
@@ -15,5 +18,8 @@ EOF
 test -d /home/algo/.ssh || (umask 077 && sudo -u algo mkdir -p /home/algo/.ssh/)
 echo "{{ lookup('file', '{{ SSH_keys.public }}') }}" | (umask 177 && sudo -u algo tee /home/algo/.ssh/authorized_keys)
 
-sudo apt-get remove -y --purge sshguard || true
+dpkg -l sshguard && until apt-get remove -y --purge sshguard; do
+  sleep 3
+done || true
+
 systemctl restart sshd.service