[master/wrynose][PATCH] systemd: drop 15-eth.network and consolidate eth interfaces in 10-eth.network

With 15-eth.network systemd-networkd ignores non-eth0 interfaces for
online detection, causing systemd-networkd-wait-online.service to stall
for 2mins even when ethX interfaces was already online.

Commit 9289107c addressed this by passing --any to systemd-wait-online,
i.e service exists as soon as any interface comes online. This makes the
commit 513e31b4 - marking ethX interfaces as RequiredForOnline=no via a
separate 15-eth.network - redundant.

Signed-off-by: Yogesh Hegde <[email protected]>
---
 .../recipes-core/systemd/systemd-arago.inc             |  2 --
 .../recipes-core/systemd/systemd/10-eth.network        |  2 +-
 .../recipes-core/systemd/systemd/15-eth.network        | 10 ----------
 3 files changed, 1 insertion(+), 13 deletions(-)
 delete mode 100644 meta-arago-distro/recipes-core/systemd/systemd/15-eth.network

diff --git a/meta-arago-distro/recipes-core/systemd/systemd-arago.inc b/meta-arago-distro/recipes-core/systemd/systemd-arago.inc
index 3ca38edc..cfd41b1d 100644
--- a/meta-arago-distro/recipes-core/systemd/systemd-arago.inc
+++ b/meta-arago-distro/recipes-core/systemd/systemd-arago.inc
@@ -4,7 +4,6 @@ FILESEXTRAPATHS:prepend := "${THISDIR}/systemd:"
 
 SRC_URI:append = " \
     file://10-eth.network \
-    file://15-eth.network \
     file://30-wlan.network \
     file://60-usb.network \
     file://timesyncd.conf \
@@ -14,7 +13,6 @@ SRC_URI:append = " \
 do_install:append() {
     install -d ${D}${sysconfdir}/systemd/network/
     install -m 0644 ${UNPACKDIR}/10-eth.network ${D}${sysconfdir}/systemd/network/
-    install -m 0644 ${UNPACKDIR}/15-eth.network ${D}${sysconfdir}/systemd/network/
     install -m 0644 ${UNPACKDIR}/30-wlan.network ${D}${sysconfdir}/systemd/network/
     install -m 0644 ${UNPACKDIR}/60-usb.network ${D}${sysconfdir}/systemd/network/
 
diff --git a/meta-arago-distro/recipes-core/systemd/systemd/10-eth.network b/meta-arago-distro/recipes-core/systemd/systemd/10-eth.network
index aad5e194..fdde1fe7 100644
--- a/meta-arago-distro/recipes-core/systemd/systemd/10-eth.network
+++ b/meta-arago-distro/recipes-core/systemd/systemd/10-eth.network
@@ -1,5 +1,5 @@
 [Match]
-Name=eth0
+Name=eth*
 KernelCommandLine=!root=/dev/nfs
 
 [Network]
diff --git a/meta-arago-distro/recipes-core/systemd/systemd/15-eth.network b/meta-arago-distro/recipes-core/systemd/systemd/15-eth.network
deleted file mode 100644
index 0aa8b22d..00000000
--- a/meta-arago-distro/recipes-core/systemd/systemd/15-eth.network
+++ /dev/null
@@ -1,10 +0,0 @@
-[Match]
-Name=eth*
-KernelCommandLine=!root=/dev/nfs
-
-[Link]
-RequiredForOnline=no
-
-[Network]
-LinkLocalAddressing=ipv4
-DHCP=yes
-- 
2.34.1