Better handling for missing NetDev.Device
- Closes: #1777 Overlays: - ifcfg - NetworkManager Signed-off-by: Jonathon Anderson <janderson@ciq.com>
This commit is contained in:
@@ -5,4 +5,15 @@
|
||||
plugins=keyfile
|
||||
|
||||
[keyfile]
|
||||
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 }}
|
||||
{{- $unmanaged := list }}
|
||||
{{- range $_, $netdev := .NetDevs }}
|
||||
{{- if $netdev.Hwaddr }}
|
||||
{{- $unmanaged = append $unmanaged (printf "except:mac:%s" $netdev.Hwaddr) }}
|
||||
{{- end }}
|
||||
{{- if $netdev.Device }}
|
||||
{{- $unmanaged = append $unmanaged (printf "except:interface-name:%s" $netdev.Device) }}
|
||||
{{- end }}
|
||||
{{- end }}
|
||||
{{- if $unmanaged }}
|
||||
unmanaged-devices={{ join "," $unmanaged }}
|
||||
{{- end }}
|
||||
|
||||
@@ -4,7 +4,9 @@
|
||||
|
||||
[connection]
|
||||
id={{ $devname }}
|
||||
{{- if $netdev.Device }}
|
||||
interface-name={{ $netdev.Device }}
|
||||
{{- end }}
|
||||
type={{ default "ethernet" (lower $netdev.Type) }}
|
||||
{{- if $netdev.Tags.master }}
|
||||
master={{ $netdev.Tags.master }}
|
||||
@@ -78,7 +80,9 @@ ipaddr="{{ $netdev.Ipaddr6 }}"
|
||||
|
||||
{{- if eq $netdev.Type "vlan" }}
|
||||
[vlan]
|
||||
{{- if $netdev.Device }}
|
||||
interface-name={{ $netdev.Device }}
|
||||
{{- end }}
|
||||
parent={{ $netdev.Tags.parent_device }}
|
||||
id={{ $netdev.Tags.vlan_id }}
|
||||
{{- end }}
|
||||
|
||||
Reference in New Issue
Block a user