Merge ~mwhudson/ubuntu/+source/initramfs-tools:ubuntu/mantic-proposed into ubuntu/+source/initramfs-tools:ubuntu/devel

[Michael Hudson-Doyle]

initramfs-tools (0.142ubuntu15) UNRELEASED; urgency=medium
.
  * scripts/functions: do not fail to configure networking too quickly. In
    particular make sure an unsuccessful attempt to run DHCP takes at least
    $ROUNDTTT seconds. (LP: #2037202)

untested!

[Steve Langasek (vorlon)]

Had to think a fair bit about the "why" here but I agree this looks correct. I also do not think we should consider it a dhcpcd-base bug that it exits before the timeout if it can't find a device to listen on, so we should regard this as an appropriate fix rather than a workaround.

review: Approve

diff --git a/debian/changelog b/debian/changelog
index 7568a03..79f7b09 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+initramfs-tools (0.142ubuntu15) mantic; urgency=medium
+
+  * scripts/functions: do not fail to configure networking too quickly. In
+    particular make sure an unsuccessful attempt to run DHCP takes at least
+    $ROUNDTTT seconds. (LP: #2037202)
+
+ -- Michael Hudson-Doyle <[e-mail]>  Wed, 04 Oct 2023 12:02:13 +1300
+
 initramfs-tools (0.142ubuntu14) mantic; urgency=medium
 
   * mkinitramfs: Skip compression support check if /boot/config-${version}
diff --git a/scripts/functions b/scripts/functions
index 1ddb235..e27a799 100644
--- a/scripts/functions
+++ b/scripts/functions
@@ -422,29 +422,9 @@ configure_networking()
 	# Documentation/frv/booting.txt
 
 	for ROUNDTTT in 2 3 4 6 9 16 25 36 64 100; do
+		local iter_entry_time iter_exit_time
 
-		# The NIC is to be configured if this file does not exist.
-		# Ip-Config tries to create this file and when it succeds
-		# creating the file, ipconfig is not run again.
-		for x in /run/net-"${DEVICE}".conf /run/net-*.conf ; do
-			if [ -e "$x" ]; then
-				IP="done"
-				break
-			fi
-		done
-
-		for x in /run/net6-"${DEVICE}".conf /run/net6-*.conf ; do
-			if [ -e "$x" ]; then
-				IP6="done"
-				break
-			fi
-		done
-
-		# if we've reached a point where both IP and IP6 are "done",
-		# then we're finished with network configuration.
-		if [ "$IP" = "done" ] && [ "$IP6" = "done" ]; then
-			break
-		fi
+		iter_entry_time=$(time_elapsed)
 
 		if [ -z "${DEVICE}" ]; then
 			_set_available_devices_to_up
@@ -482,6 +462,35 @@ configure_networking()
 			dhcpcd -1 -t $ROUNDTTT -6 ${DEVICE6:+"${DEVICE6}"}
 			;;
 		esac
+
+		# The NIC is to be configured if this file does not exist.
+		# Ip-Config tries to create this file and when it succeds
+		# creating the file, ipconfig is not run again.
+		for x in /run/net-"${DEVICE}".conf /run/net-*.conf ; do
+			if [ -e "$x" ]; then
+				IP="done"
+				break
+			fi
+		done
+
+		for x in /run/net6-"${DEVICE}".conf /run/net6-*.conf ; do
+			if [ -e "$x" ]; then
+				IP6="done"
+				break
+			fi
+		done
+
+		# if we've reached a point where both IP and IP6 are "done",
+		# then we're finished with network configuration.
+		if [ "$IP" = "done" ] && [ "$IP6" = "done" ]; then
+			break
+		fi
+
+		iter_exit_time=$(time_elapsed)
+
+		if [ $((iter_exit_time - iter_entry_time)) -le $ROUNDTTT ]; then
+			sleep $((ROUNDTTT - iter_exit_time + iter_entry_time))
+		fi
 	done
 
 	# source ipconfig output for either $DEVICE or the first one.