webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-04-26 02:42:58 +02:00
Code Issues Packages Projects Releases Wiki Activity

aws: Execute user-data script while we have networking up

Browse Source 
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
This commit is contained in:
Michael Tremer
2018-08-13 12:14:49 +01:00
parent 3d0e252e35
commit 8defa50e73
2 changed files with 17 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/initscripts/helper/aws-setup
View File

@@ -109,8 +109,23 @@ import_aws_configuration() {
fi
done
# Download user-data
local user_data="$(get user-data)"
# Download the user-data script only on the first boot
if [ ! -e "/var/ipfire/main/firstsetup_ok" ]; then
# Download user-data
local user_data="$(get user-data)"
# Save user-data script to be executed later
if [ "${user_data:0:2}" = "#!" ]; then
echo "${user_data}" > /tmp/aws-user-data.script
chmod 700 /tmp/aws-user-data.script
# Run the user-data script
/tmp/aws-user-data.script
# Delete the script right away
rm /tmp/aws-user-data.script
fi
fi
# Import any DNS server settings
eval $(/usr/local/bin/readhash <(grep -E "^DNS([0-9])=" /var/ipfire/ethernet/settings 2>/dev/null))
@@ -252,12 +267,6 @@ import_aws_configuration() {
# This script has now completed the first steps of setup
touch /var/ipfire/main/firstsetup_ok
# Save user-data script to be executed later
if [ "${user_data:0:2}" = "#!" ]; then
echo "${user_data}" > /tmp/aws-user-data.script
chmod 700 /tmp/aws-user-data.script
fi
fi
# All done

8
src/initscripts/system/aws
View File

@@ -60,14 +60,6 @@ case "${1}" in
# End DHCP client immediately
dhclient -sf /etc/rc.d/helper/aws-setup -r "${intf}" &>/dev/null
# Run AWS user-data script
if [ -x "/tmp/aws-user-data.script" ]; then
/tmp/aws-user-data.script
# Delete the script right away
rm /tmp/aws-user-data.script
fi
exit 0
;;