X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/0b4945244d55214b331adabce38e33800b55b3e1..bb99d90e25a47dff9405fb6f68be0779dd2d8989:/tools/salt-install/provision.sh?ds=sidebyside

diff --git a/tools/salt-install/provision.sh b/tools/salt-install/provision.sh
index c9e535fad2..be1506c620 100755
--- a/tools/salt-install/provision.sh
+++ b/tools/salt-install/provision.sh
@@ -302,7 +302,10 @@ else
       yum install -y  curl git jq
       ;;
     "debian"|"ubuntu")
-      DEBIAN_FRONTEND=noninteractive apt update
+      # Wait 2 minutes for any apt locks to clear
+      # This option is supported from apt 1.9.1 and ignored in older apt versions.
+      # Cf. https://blog.sinjakli.co.uk/2021/10/25/waiting-for-apt-locks-without-the-hacky-bash-scripts/
+      DEBIAN_FRONTEND=noninteractive apt -o DPkg::Lock::Timeout=120 update
       DEBIAN_FRONTEND=noninteractive apt install -y curl git jq
       ;;
   esac