al/tiny-cloud
al/tiny-cloud
1
0
Fork 0
mirror of https://gitlab.alpinelinux.org/alpine/cloud/tiny-cloud.git synced 2025-12-16 11:52:43 +03:00
Code Packages Wiki

Report exit code from user-data instead of from tee

Browse Source
This commit is contained in:
Tomas Volf 2020-05-18 11:07:47 +02:00 committed by Mike Crute
parent 1f4f4fccb8
commit 7838c22ea6
1 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
tiny-ec2-bootstrap
View File

@ -54,12 +54,19 @@ _set_ssh_keys() {
} }
_run_userdata() { _run_userdata() {
user_data=$(_get_metadata user-data) local user_data="$(_get_metadata user-data)"
if echo "$user_data" | grep -q '^#!/'; then if printf '%s' "$user_data" | head -n1 | grep -q '^#!/'; then
echo "$user_data" > /var/lib/cloud/user-data.sh printf '%s' "$user_data" >/var/lib/cloud/user-data.sh
chmod +x /var/lib/cloud/user-data.sh chmod +x /var/lib/cloud/user-data.sh
/var/lib/cloud/user-data.sh 2>&1 | tee /var/log/cloud-bootstrap.log
echo "User Data Script Exit Status: $?" local log_file=/var/log/cloud-bootstrap.log
local ec_file=/var/log/cloud-bootstrap.exit
{ /var/lib/cloud/user-data.sh 2>&1 ; echo $? >"$ec_file"; } | tee "$log_file"
ec=$(cat "$ec_file")
echo "User Data Script Exit Status: $ec"
return $ec
fi fi
} }