[ARVADOS] created: 2.1.0-2066-g8cb634167

[Git user]

        at  8cb6341670a9164811e82ca7e6cf88af414daa86 (commit)


commit 8cb6341670a9164811e82ca7e6cf88af414daa86
Author: Ward Vandewege <ward at curii.com>
Date:   Tue Mar 15 11:48:57 2022 -0400

    Fix azure compute node image build.
    
    refs #18772
    
    Arvados-DCO-1.1-Signed-off-by: Ward Vandewege <ward at curii.com>

diff --git a/tools/compute-images/scripts/base.sh b/tools/compute-images/scripts/base.sh
index 90b845f1a..5ee52174a 100644
--- a/tools/compute-images/scripts/base.sh
+++ b/tools/compute-images/scripts/base.sh
@@ -145,7 +145,10 @@ if [ "x$RESOLVER" != "x" ]; then
   $SUDO sed -i "s/#prepend domain-name-servers 127.0.0.1;/prepend domain-name-servers ${RESOLVER};/" /etc/dhcp/dhclient.conf
 fi
 
-if [ "$AWS_EBS_AUTOSCALE" != "1" ]; then
+# AWS_EBS_AUTOSCALE is not always set, work around unset variable check
+EBS_AUTOSCALE=${AWS_EBS_AUTOSCALE:-}
+
+if [ "$EBS_AUTOSCALE" != "1" ]; then
   # Set up the cloud-init script that will ensure encrypted disks
   $SUDO mv /tmp/usr-local-bin-ensure-encrypted-partitions.sh /usr/local/bin/ensure-encrypted-partitions.sh
 else

-----------------------------------------------------------------------


hooks/post-receive
--