diff -Nru netcfg-1.138ubuntu2/debian/changelog netcfg-1.138ubuntu3/debian/changelog --- netcfg-1.138ubuntu2/debian/changelog 2016-08-25 15:29:05.000000000 +0000 +++ netcfg-1.138ubuntu3/debian/changelog 2017-01-09 12:52:06.000000000 +0000 @@ -1,3 +1,10 @@ +netcfg (1.138ubuntu3) zesty; urgency=medium + + * Also use short stable systemd-udev names to discover descriptions for + the network interfaces. LP: #1572620 + + -- Dimitri John Ledkov Mon, 09 Jan 2017 12:51:54 +0000 + netcfg (1.138ubuntu2) yakkety; urgency=medium * On NetworkManager-using systems, write a netplan config file to hand diff -Nru netcfg-1.138ubuntu2/debian/netcfg-common.templates netcfg-1.138ubuntu3/debian/netcfg-common.templates --- netcfg-1.138ubuntu2/debian/netcfg-common.templates 2016-08-12 08:00:07.000000000 +0000 +++ netcfg-1.138ubuntu3/debian/netcfg-common.templates 2017-01-09 12:51:50.000000000 +0000 @@ -285,6 +285,21 @@ # :sl2: _Description: Ethernet +Template: netcfg/internal-enc +Type: text +# :sl2: +_Description: Ethernet CCW bus + +Template: netcfg/internal-enP +Type: text +# :sl2: +_Description: Ethernet PCI + +Template: netcfg/internal-enp +Type: text +# :sl2: +_Description: Ethernet PCI + Template: netcfg/internal-tr Type: text # :sl2: diff -Nru netcfg-1.138ubuntu2/netcfg-common.c netcfg-1.138ubuntu3/netcfg-common.c --- netcfg-1.138ubuntu2/netcfg-common.c 2016-08-12 08:12:34.000000000 +0000 +++ netcfg-1.138ubuntu3/netcfg-common.c 2017-01-09 12:51:50.000000000 +0000 @@ -564,6 +564,16 @@ CMD_SUCCESS && client->value != NULL) { return strdup(client->value); } + /* If using systemd-udevd stable names try that as well + Those have two character prefix, then one character for + subtype. */ + if (strlen(template) > 19) { + template[19] = '\0'; + if (debconf_metaget(client, template, "description") == + CMD_SUCCESS && client->value != NULL) { + return strdup(client->value); + } + } } else { strcpy(template, "netcfg/internal-wifi"); debconf_metaget(client, template, "description");