AWS: Prefer red* or eth* when importing configuration

This change is necessary to make sure that the script prefers
are link with internet access. That would usually be red (after
the second boot) or eth* (on the first boot).

That allows (and ensures) that we can install packages in
the user-data script.

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

diff --git a/config/rootfiles/core/127/filelists/files b/config/rootfiles/core/127/filelists/files
index ce4e5176819cd602789659e1ec55e95db3d971f4..1bcc4ca54887bc818e85818edf1d6d05a45acd9c 100644 (file)
--- a/config/rootfiles/core/127/filelists/files
+++ b/config/rootfiles/core/127/filelists/files
@@ -2,3 +2,4 @@ etc/system-release
 etc/issue
 srv/web/ipfire/cgi-bin/credits.cgi
 var/ipfire/langs
+etc/rc.d/init.d/aws

diff --git a/src/initscripts/system/aws b/src/initscripts/system/aws
index 2a556801ac8ca5854798096b31b0fa65277a7cf3..b22af7573725820cae7d4c982ac197f4f00792c7 100644 (file)
--- a/src/initscripts/system/aws
+++ b/src/initscripts/system/aws
@@ -34,7 +34,8 @@ case "${1}" in
                running_on_ec2 || exit 0
 
                # Find the first interface to use
-               for i in /sys/class/net/*; do
+               for i in /sys/class/net/red* /sys/class/net/eth* \
+                               /sys/class/net/*; do
                        [ -d "${i}" ] || continue
                        i=$(basename ${i})