sunet-cdn/cdn-ops
2
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Enable "set -e" again

Browse source 
Good idea to fail when unexpected things go wrong. Additional fixes
added to the script to not stop where we can expect a non-zero return
code.

Requested by @fredrikt who also reviewed the patch before going in,
thanks!
This commit is contained in:
Patrik Lundin 2022-10-12 16:26:20 +02:00
parent c55e5535a2
commit 020b8fe34c
Signed by: patlu
GPG key ID: A0A812BA2249F294
1 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
global/overlay/etc/cosmos/apt/bootstrap-cosmos.sh
View file

@ -1,7 +1,6 @@
#!/bin/sh #!/bin/sh
#set -e set -e
# not all breakage is un-recoverable...
cmd_hostname="$1" cmd_hostname="$1"
if test -z "$cmd_hostname"; then if test -z "$cmd_hostname"; then
@ -32,7 +31,9 @@ export DEBIAN_FRONTEND='noninteractive'
apt-get -y update apt-get -y update
apt-get -y upgrade apt-get -y upgrade
for pkg in rsync git git-core wget gpg; do for pkg in rsync git git-core wget gpg; do
apt-get -y install $pkg # script is running with "set -e", use "|| true" to allow packages to not
# exist without stopping the script
apt-get -y install $pkg || true
done done
dpkg -i cosmos_1.5-1_all.deb dpkg -i cosmos_1.5-1_all.deb
@ -40,8 +41,10 @@ if ! test -d /var/cache/cosmos/repo; then
cosmos clone "$cmd_repo" cosmos clone "$cmd_repo"
fi fi
# re-run cosmos at reboot until it succeeds - use bash -l to get working proxy settings # Re-run cosmos at reboot until it succeeds - use bash -l to get working proxy settings.
grep -v "^exit 0" /etc/rc.local > /etc/rc.local.new # It is possible the file does not exist or contains no matching lines,
# both cases are OK
grep -v "^exit 0" /etc/rc.local > /etc/rc.local.new || true
(echo "" (echo ""
echo "test -f /etc/run-cosmos-at-boot && (bash -l cosmos -v update; bash -l cosmos -v apply && rm /etc/run-cosmos-at-boot)" echo "test -f /etc/run-cosmos-at-boot && (bash -l cosmos -v update; bash -l cosmos -v apply && rm /etc/run-cosmos-at-boot)"
echo "" echo ""
@ -52,8 +55,7 @@ mv -f /etc/rc.local.new /etc/rc.local
touch /etc/run-cosmos-at-boot touch /etc/run-cosmos-at-boot
# If this cloud-config is set, it will interfere with our changes to /etc/hosts # If this cloud-config is set, it will interfere with our changes to /etc/hosts
grep -q 'manage_etc_hosts: true' /etc/cloud/cloud.cfg if [ -f /etc/cloud/cloud.cfg ]; then
if [ ${?} -eq 0 ]; then
sed -i 's/manage_etc_hosts: true/manage_etc_hosts: false/g' /etc/cloud/cloud.cfg sed -i 's/manage_etc_hosts: true/manage_etc_hosts: false/g' /etc/cloud/cloud.cfg
fi fi