From 36d6ea1b7bd232212b2b0c37c76eb3d35837837c Mon Sep 17 00:00:00 2001 From: Jonathon Anderson Date: Mon, 28 Oct 2024 15:37:02 -0600 Subject: [PATCH] NetworkManager manages any known device or mac Signed-off-by: Jonathon Anderson --- overlays/NetworkManager/internal/networkmanager_test.go | 4 ++-- .../rootfs/etc/NetworkManager/conf.d/ww4-unmanaged.ww | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/overlays/NetworkManager/internal/networkmanager_test.go b/overlays/NetworkManager/internal/networkmanager_test.go index 9576a202..64e12940 100644 --- a/overlays/NetworkManager/internal/networkmanager_test.go +++ b/overlays/NetworkManager/internal/networkmanager_test.go @@ -98,7 +98,7 @@ Filename: warewulf-unmanaged.conf plugins=keyfile [keyfile] -unmanaged-devices=except:mac:9a:77:29:73:14:f1, +unmanaged-devices=except:interface-name:wwnet0,except:mac:9a:77:29:73:14:f1,except:interface-name:wwnet1, ` const networkmanager_unmanaged string = `backupFile: true @@ -109,7 +109,7 @@ Filename: warewulf-unmanaged.conf plugins=keyfile [keyfile] -unmanaged-devices=except:mac:e6:92:39:49:7b:03,except:mac:9a:77:29:73:14:f1, +unmanaged-devices=except:mac:e6:92:39:49:7b:03,except:interface-name:wwnet0,except:mac:9a:77:29:73:14:f1,except:interface-name:wwnet1, ` const networkmanager_managed string = `backupFile: true diff --git a/overlays/NetworkManager/rootfs/etc/NetworkManager/conf.d/ww4-unmanaged.ww b/overlays/NetworkManager/rootfs/etc/NetworkManager/conf.d/ww4-unmanaged.ww index 578aab71..be8a9cbb 100644 --- a/overlays/NetworkManager/rootfs/etc/NetworkManager/conf.d/ww4-unmanaged.ww +++ b/overlays/NetworkManager/rootfs/etc/NetworkManager/conf.d/ww4-unmanaged.ww @@ -5,4 +5,4 @@ plugins=keyfile [keyfile] -unmanaged-devices={{ range $connection_id, $netdev := .NetDevs }}{{ if $netdev.Hwaddr }}except:mac:{{- $netdev.Hwaddr -}},{{ end }}{{ end }} +unmanaged-devices={{ range $connection_id, $netdev := .NetDevs }}{{ if $netdev.Hwaddr }}except:mac:{{ $netdev.Hwaddr }},{{ end }}{{ if $netdev.Device }}except:interface-name:{{ $netdev.Device }},{{ end }}{{ end }}