[PATCH installer v5 04/23] install: do not rely on interface name map to be fully populated

[Christoph Heiss <c.heiss@proxmox.com>]

Interfaces without a pinned ID, i.e. virtual links, never get an entry
in the interface name pinning map. Should the live environment have
such an interface, the configuration would contain a stanza without an
interface name for it, so fall back to its kernel name instead.

While this hasn't been a problem yet AFAIK, better be safe than sorry.

Signed-off-by: Christoph Heiss <c.heiss@proxmox.com>
---
Changes v4 -> v5:
  * no changes

Changes v3 -> v4:
  * no changes

Changes v2 -> v3:
  * add test and expanded commit message, as proposed by Thomas

Changes v1 -> v2:
  * no changes

 Proxmox/Install.pm                |  6 +++-
 test/generate-ifupdown2-config.pl | 58 ++++++++++++++++++++++++++++---
 2 files changed, 59 insertions(+), 5 deletions(-)

diff --git a/Proxmox/Install.pm b/Proxmox/Install.pm
index a98571f..6c7af3d 100644
--- a/Proxmox/Install.pm
+++ b/Proxmox/Install.pm
@@ -852,7 +852,11 @@ sub generate_ifupdown2_config {
 
     foreach my $iface (sort keys $interfaces->%*) {
         my $if = $interfaces->{$iface};
-        my $name = defined($netif_pin_map) ? $netif_pin_map->{ $if->{mac} } : $if->{name};
+        my $name =
+            defined($netif_pin_map)
+            && defined($netif_pin_map->{ $if->{mac} })
+            ? $netif_pin_map->{ $if->{mac} }
+            : $if->{name};
 
         next if $name eq $ethdev;
 
diff --git a/test/generate-ifupdown2-config.pl b/test/generate-ifupdown2-config.pl
index 5c1794e..7f92e4f 100755
--- a/test/generate-ifupdown2-config.pl
+++ b/test/generate-ifupdown2-config.pl
@@ -49,6 +49,11 @@ EOT
     );
 }
 
+my $pin_map = {
+    '12:34:56:ab:cd:ef' => 'nic0',
+    'ab:cd:ef:12:34:56' => 'nic1',
+};
+
 # global config
 $proxmox_install_runenv->redefine(
     get => sub {
@@ -123,10 +128,8 @@ EOT
 
 # interface name pinning test
 Proxmox::Install::Config::merge({
-    network_interface_pin_map => {
-        '12:34:56:ab:cd:ef' => 'nic0',
-        'ab:cd:ef:12:34:56' => 'nic1',
-    },
+    mngmt_nic => 'eno1',
+    network_interface_pin_map => $pin_map,
 });
 is_generated(
     <<EOT
@@ -194,4 +197,51 @@ EOT
     , 'gateway learned from IPv6 router advertisements is not configured statically',
 );
 
+# Check that unpinnable interfaces (e.g. virtual ones) keep their kernel-assigned name
+Proxmox::Install::Config::merge({
+    network_interface_pin_map => $pin_map,
+    cidr => '192.168.0.10/24',
+    gateway => '192.168.0.1',
+});
+set_config(bridge => 0);
+$proxmox_install_runenv->redefine(
+    get => sub {
+        return {
+            network => {
+                interfaces => {
+                    eno1 => {
+                        mac => '12:34:56:ab:cd:ef',
+                        index => 1,
+                        name => 'eno1',
+                    },
+                    eno2 => {
+                        mac => 'ab:cd:ef:12:34:56',
+                        index => 2,
+                        name => 'eno2',
+                    },
+                    dummy => {
+                        mac => 'aa:bb:cc:dd:ee:ff',
+                        index => 3,
+                        name => 'dummy',
+                    },
+                },
+            },
+        };
+    },
+);
+
+is_generated(
+    <<EOT
+auto nic0
+iface nic0 inet static
+	address 192.168.0.10/24
+	gateway 192.168.0.1
+
+iface dummy inet manual
+
+iface nic1 inet manual
+EOT
+    , 'unpinnable names keep their kernel name',
+);
+
 done_testing();
-- 
2.56.0