[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 81e1e80e38609e01f98af649ee38e064420bab3d

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 81e1e80e38609e01f98af649ee38e064420bab3d

[Michael Tremer]

[-- Attachment #1: Type: text/plain, Size: 2294 bytes --]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".

The branch, next has been updated
       via  81e1e80e38609e01f98af649ee38e064420bab3d (commit)
      from  58e840bd96d6f7e34d332d8b18c95857ced5ca1d (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 81e1e80e38609e01f98af649ee38e064420bab3d
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Wed Dec 12 11:34:12 2018 +0000

    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(a)ipfire.org>

-----------------------------------------------------------------------

Summary of changes:
 config/rootfiles/core/127/filelists/files | 1 +
 src/initscripts/system/aws                | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

Difference in files:
diff --git a/config/rootfiles/core/127/filelists/files b/config/rootfiles/core/127/filelists/files
index ce4e51768..1bcc4ca54 100644
--- 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 2a556801a..b22af7573 100644
--- 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})
 


hooks/post-receive
--
IPFire 2.x development tree