From: Ward Vandewege Date: Thu, 26 May 2022 16:34:20 +0000 (-0400) Subject: Make compute node image script compatible with Ubuntu. X-Git-Tag: 2.5.0~151 X-Git-Url: https://git.arvados.org/arvados.git/commitdiff_plain/c0acc59c8ae5f3ab7fead209d840587a827767ae Make compute node image script compatible with Ubuntu. No issue # Arvados-DCO-1.1-Signed-off-by: Ward Vandewege --- diff --git a/tools/compute-images/scripts/base.sh b/tools/compute-images/scripts/base.sh index c9fd0945d2..6ab9de9184 100644 --- a/tools/compute-images/scripts/base.sh +++ b/tools/compute-images/scripts/base.sh @@ -50,8 +50,8 @@ echo "deb http://apt.arvados.org/$LSB_RELEASE_CODENAME $LSB_RELEASE_CODENAME${RE # Add the arvados signing key cat /tmp/1078ECD7.asc | $SUDO apt-key add - -# Add the debian keys -wait_for_apt_locks && $SUDO DEBIAN_FRONTEND=noninteractive apt-get install --yes debian-keyring debian-archive-keyring +# Add the debian keys (but don't abort if we can't find them, e.g. on Ubuntu where we don't need them) +wait_for_apt_locks && $SUDO DEBIAN_FRONTEND=noninteractive apt-get install --yes debian-keyring debian-archive-keyring 2>/dev/null || true # Fix locale $SUDO /bin/sed -ri 's/# en_US.UTF-8 UTF-8/en_US.UTF-8 UTF-8/' /etc/locale.gen