[ARVADOS] updated: 2.3.2-51-g0eb3e4424

Git user git at public.arvados.org
Tue Mar 1 21:57:38 UTC 2022


Summary of changes:
 tools/salt-install/provision.sh | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

       via  0eb3e44248cce822c97aff3882be37830ca9502b (commit)
      from  fc1bcfc9058f6bcdcbfe22fef7c85ef2b683af76 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit 0eb3e44248cce822c97aff3882be37830ca9502b
Author: Ward Vandewege <ward at curii.com>
Date:   Tue Mar 1 16:57:07 2022 -0500

    18785: avoid error when /etc/cloud/cloud.cfg.d does not exist.
    
    Arvados-DCO-1.1-Signed-off-by: Ward Vandewege <ward at curii.com>

diff --git a/tools/salt-install/provision.sh b/tools/salt-install/provision.sh
index ca857af25..630eb6695 100755
--- a/tools/salt-install/provision.sh
+++ b/tools/salt-install/provision.sh
@@ -784,8 +784,10 @@ echo '\pset pager off' >> /root/.psqlrc
 salt-call --local state.apply -l ${LOG_LEVEL}
 
 # Finally, make sure that /etc/hosts is not overwritten on reboot
-# TODO: will this work on CentOS?
-sed -i 's/^manage_etc_hosts: true/#manage_etc_hosts: true/g' /etc/cloud/cloud.cfg.d/*
+if [ -d /etc/cloud/cloud.cfg.d ]; then
+  # TODO: will this work on CentOS?
+  sed -i 's/^manage_etc_hosts: true/#manage_etc_hosts: true/g' /etc/cloud/cloud.cfg.d/*
+fi
 
 # FIXME! #16992 Temporary fix for psql call in arvados-api-server
 if [ "x${DELETE_PSQL}" = "xyes" ]; then

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


hooks/post-receive
-- 




More information about the arvados-commits mailing list