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

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/src/initscripts/helper/aws-setup b/src/initscripts/helper/aws-setup
index 122e5a31ddd4b4ec778884a39dc948ed27ab9ddd..955583c0291951c6a356c8eaa8f159c585c276b1 100644 (file)
--- a/src/initscripts/helper/aws-setup
+++ b/src/initscripts/helper/aws-setup
@@ -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

diff --git a/src/initscripts/system/aws b/src/initscripts/system/aws
index 896b3b17a1dd3c2471c7b6f4923356ba2847edec..6fce670a03a79e8d75332bf677068ae78c5c6a35 100644 (file)
--- a/src/initscripts/system/aws
+++ b/src/initscripts/system/aws
@@ -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
                ;;