From 5e60c91a04a9dc1b7497211382f3046d154c8cd0 Mon Sep 17 00:00:00 2001
From: Anton Midyukov <antohami@altlinux.org>
Date: Fri, 5 Feb 2021 22:48:52 +0700
Subject: [PATCH] net-eth, mipsel-*: Add new target
 use/net-eth/dhcp/timeout/$TIMEOUT

Thanks for the idea Ivan A. Melnikov.
---
 features.in/mipsel-bfk3/config.mk                     | 2 +-
 features.in/mipsel-mitx/config.mk                     | 2 +-
 features.in/net-eth/config.mk                         | 5 +++++
 features.in/net-eth/rootfs/image-scripts.d/50-net-eth | 6 +-----
 4 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/features.in/mipsel-bfk3/config.mk b/features.in/mipsel-bfk3/config.mk
index 4c061c14..826345da 100644
--- a/features.in/mipsel-bfk3/config.mk
+++ b/features.in/mipsel-bfk3/config.mk
@@ -1,4 +1,4 @@
-use/mipsel-bfk3: use/kernel use/tty/S0
+use/mipsel-bfk3: use/kernel use/tty/S0 use/net-eth/dhcp/timeout/20
 	@$(call add_feature)
 	@$(call set,KFLAVOURS,bfk3-def)
 	@$(call set,VM_FSTYPE,ext2)
diff --git a/features.in/mipsel-mitx/config.mk b/features.in/mipsel-mitx/config.mk
index cca2d788..5232baab 100644
--- a/features.in/mipsel-mitx/config.mk
+++ b/features.in/mipsel-mitx/config.mk
@@ -1,4 +1,4 @@
-use/mipsel-mitx: use/kernel use/tty/S0
+use/mipsel-mitx: use/kernel use/tty/S0 use/net-eth/dhcp/timeout/20
 	@$(call add_feature)
 	@$(call set,KFLAVOURS,mitx-xpa)
 	@$(call add,THE_PACKAGES,alt-config-be-t)
diff --git a/features.in/net-eth/config.mk b/features.in/net-eth/config.mk
index 259896e8..dafd3a7f 100644
--- a/features.in/net-eth/config.mk
+++ b/features.in/net-eth/config.mk
@@ -16,6 +16,11 @@ use/net-eth/networkd: use/net/networkd
 # typical boilerplate
 use/net-eth/dhcp: use/net-eth use/net/dhcp
 	@$(call add,NET_ETH,eth0:dhcp)
+	@$(call try,NET_ETH_TIMEOUT,7)
+	@$(call xport,NET_ETH_TIMEOUT)
+
+use/net-eth/dhcp/timeout/%: use/net-eth/dhcp
+	@$(call set,NET_ETH_TIMEOUT,$*)
 
 use/net-eth/networkd-dhcp: use/net-eth/networkd
 	@$(call add,NET_ETH,eth0:dhcp)
diff --git a/features.in/net-eth/rootfs/image-scripts.d/50-net-eth b/features.in/net-eth/rootfs/image-scripts.d/50-net-eth
index 5e4ee2d4..92bde492 100755
--- a/features.in/net-eth/rootfs/image-scripts.d/50-net-eth
+++ b/features.in/net-eth/rootfs/image-scripts.d/50-net-eth
@@ -42,11 +42,7 @@ write_etcnet_iface() {
 	append=
 	case "$proto" in
 	dhcp)
-		if [ $GLOBAL_ARCH = mipsel ]; then
-			append="DHCP_TIMEOUT=20"
-		else
-			append="DHCP_TIMEOUT=7"
-		fi
+		append="DHCP_TIMEOUT=$GLOBAL_NET_ETH_TIMEOUT"
 		;;
 	static)
 		echo "$ipv4addr" > "$dir/ipv4address"