Bug#990568: netcfg: Link detection timeout question should show interface name

[Daniel Lewart <lewart3@gmail.com>]

Package: netcfg
Version: 1.174
Severity: minor
Tags: patch

Debian Installer Team,

Laptop has both an Ethernet and a Wi-Fi interface.

D-I "Configure the network" asks for the link detection timeout twice
without indicating the interface, which can be confusing.

Below is an *untested* patch which adds the interface name to the
netcfg/link_wait_timeout Description.

Thank you!
Daniel Lewart
Urbana, Illinois
---
diff -ru netcfg-1.174/debian/netcfg-common.templates netcfg/debian/netcfg-common.templates
--- netcfg-1.174/debian/netcfg-common.templates	2019-11-17 15:18:26.000000000 -0600
+++ netcfg/debian/netcfg-common.templates	2021-07-02 00:00:00.000000000 -0500
@@ -355,7 +355,7 @@
 Type: string
 Default: 3
 # :sl3:
-_Description: Waiting time (in seconds) for link detection:
+_Description: Waiting time (in seconds) for link detection on ${iface}:
  Please enter the maximum time you would like to wait for network link
  detection.
 
diff -ru netcfg-1.174/debian/po/templates.pot netcfg/debian/po/templates.pot
--- netcfg-1.174/debian/po/templates.pot	2020-01-28 14:40:57.000000000 -0600
+++ netcfg/debian/po/templates.pot	2021-07-02 00:00:00.000000000 -0500
@@ -606,7 +606,7 @@
 #. Description
 #. :sl3:
 #: ../netcfg-common.templates:50001
-msgid "Waiting time (in seconds) for link detection:"
+msgid "Waiting time (in seconds) for link detection on ${iface}:"
 msgstr ""
 
 #. Type: string
diff -ru netcfg-1.174/netcfg-common.c netcfg/netcfg-common.c
--- netcfg-1.174/netcfg-common.c	2021-02-22 03:39:40.000000000 -0600
+++ netcfg/netcfg-common.c	2021-07-02 00:00:00.000000000 -0500
@@ -1484,6 +1484,7 @@
     /* Ask for link detection timeout. */
     int ok = 0;
     debconf_capb(client, "");
+    debconf_subst(client, "netcfg/link_wait_timeout", "iface", if_name);
 
     while (!ok) {
         debconf_input(client, "low", "netcfg/link_wait_timeout");