diff --git a/internal/pkg/node/datastructure.go b/internal/pkg/node/datastructure.go index e26908fc..40e635be 100644 --- a/internal/pkg/node/datastructure.go +++ b/internal/pkg/node/datastructure.go @@ -79,7 +79,7 @@ type KernelConf struct { type NetDev struct { Type string `yaml:"type,omitempty" lopt:"type" sopt:"T" comment:"Set device type of given network"` - OnBoot *bool `yaml:"onboot,omitempty" lopt:"onboot" comment:"Enable/disable network device (true/false)"` + OnBoot wwtype.WWbool `yaml:"onboot,omitempty" lopt:"onboot" comment:"Enable/disable network device (true/false)"` Device string `yaml:"device,omitempty" lopt:"netdev" sopt:"N" comment:"Set the device for given network"` Hwaddr string `yaml:"hwaddr,omitempty" lopt:"hwaddr" sopt:"H" comment:"Set the device's HW address for given network" type:"MAC"` Ipaddr net.IP `yaml:"ipaddr,omitempty" comment:"IPv4 address in given network" sopt:"I" lopt:"ipaddr" type:"IP"` diff --git a/overlays/NetworkManager/internal/nodes.conf-vlan b/overlays/NetworkManager/internal/nodes.conf-vlan index 3302207f..71338a9a 100644 --- a/overlays/NetworkManager/internal/nodes.conf-vlan +++ b/overlays/NetworkManager/internal/nodes.conf-vlan @@ -3,8 +3,10 @@ nodes: primary network: untagged network devices: untagged: + onboot: true device: eth0 tagged: + onboot: true type: vlan device: eth0.902 tags: diff --git a/overlays/NetworkManager/rootfs/etc/NetworkManager/system-connections/ww4-managed.ww b/overlays/NetworkManager/rootfs/etc/NetworkManager/system-connections/ww4-managed.ww index 2640b892..1c0e5c7c 100644 --- a/overlays/NetworkManager/rootfs/etc/NetworkManager/system-connections/ww4-managed.ww +++ b/overlays/NetworkManager/rootfs/etc/NetworkManager/system-connections/ww4-managed.ww @@ -14,7 +14,7 @@ master={{ $master }} type=ethernet {{- else }} type={{if $netdev.Type}}{{ $netdev.Type }}{{ else }}ethernet{{end}} -{{- if or $netdev.OnBoot (eq $netdev.OnBoot nil) }} +{{- if $netdev.OnBoot }} autoconnect=true {{- end }} {{- end }} diff --git a/overlays/debian.interfaces/internal/debian_interfaces_test.go b/overlays/debian.interfaces/internal/debian_interfaces_test.go index ad0a3ade..2b2e5f97 100644 --- a/overlays/debian.interfaces/internal/debian_interfaces_test.go +++ b/overlays/debian.interfaces/internal/debian_interfaces_test.go @@ -53,7 +53,6 @@ const debian_interfaces string = `backupFile: true writeFile: true Filename: default # This file is autogenerated by warewulf -auto wwnet0 allow-hotplug wwnet0 iface wwnet0 inet static address 192.168.3.21 @@ -64,7 +63,6 @@ backupFile: true writeFile: true Filename: secondary # This file is autogenerated by warewulf -auto wwnet1 allow-hotplug wwnet1 iface wwnet1 inet static address 192.168.3.22 diff --git a/overlays/debian.interfaces/rootfs/etc/network/interfaces.d/default.ww b/overlays/debian.interfaces/rootfs/etc/network/interfaces.d/default.ww index 178ec263..e1fe1cdb 100644 --- a/overlays/debian.interfaces/rootfs/etc/network/interfaces.d/default.ww +++ b/overlays/debian.interfaces/rootfs/etc/network/interfaces.d/default.ww @@ -1,7 +1,7 @@ {{- range $devname, $netdev := .ThisNode.NetDevs }} {{- file $devname }} # This file is autogenerated by warewulf -{{- if or $netdev.OnBoot (eq $netdev.OnBoot nil) }} +{{- if $netdev.OnBoot }} auto {{ $netdev.Device }} {{- end }} allow-hotplug {{ $netdev.Device }} diff --git a/overlays/ifcfg/internal/ifcfg_test.go b/overlays/ifcfg/internal/ifcfg_test.go index 3725f4b6..c78b73f3 100644 --- a/overlays/ifcfg/internal/ifcfg_test.go +++ b/overlays/ifcfg/internal/ifcfg_test.go @@ -83,7 +83,6 @@ IPADDR=192.168.3.21 NETMASK=255.255.255.0 GATEWAY=192.168.3.1 HWADDR=e6:92:39:49:7b:03 -ONBOOT=true IPV6INIT=yes IPV6_AUTOCONF=yes IPV6_DEFROUTE=yes @@ -102,7 +101,6 @@ IPADDR=192.168.3.22 NETMASK=255.255.255.0 GATEWAY=192.168.3.1 HWADDR=9a:77:29:73:14:f1 -ONBOOT=true IPV6INIT=yes IPV6_AUTOCONF=yes IPV6_DEFROUTE=yes diff --git a/overlays/ifcfg/internal/nodes.conf-vlan b/overlays/ifcfg/internal/nodes.conf-vlan index 1f418c08..1345481e 100644 --- a/overlays/ifcfg/internal/nodes.conf-vlan +++ b/overlays/ifcfg/internal/nodes.conf-vlan @@ -3,8 +3,10 @@ nodes: primary network: untagged network devices: untagged: + onboot: true device: eth0 tagged: + onboot: true type: vlan device: eth0.902 tags: diff --git a/overlays/ifcfg/rootfs/etc/sysconfig/network-scripts/ifcfg.ww b/overlays/ifcfg/rootfs/etc/sysconfig/network-scripts/ifcfg.ww index ffe040d5..f89b7c36 100644 --- a/overlays/ifcfg/rootfs/etc/sysconfig/network-scripts/ifcfg.ww +++ b/overlays/ifcfg/rootfs/etc/sysconfig/network-scripts/ifcfg.ww @@ -27,7 +27,7 @@ GATEWAY={{ $netdev.Gateway }} {{- if $netdev.Hwaddr }} HWADDR={{ $netdev.Hwaddr }} {{- end }} -{{ if or $netdev.OnBoot (eq $netdev.OnBoot nil) -}} +{{- if $netdev.OnBoot }} ONBOOT=true {{- end }} IPV6INIT=yes diff --git a/overlays/wicked/internal/nodes.conf-vlan b/overlays/wicked/internal/nodes.conf-vlan index 3302207f..71338a9a 100644 --- a/overlays/wicked/internal/nodes.conf-vlan +++ b/overlays/wicked/internal/nodes.conf-vlan @@ -3,8 +3,10 @@ nodes: primary network: untagged network devices: untagged: + onboot: true device: eth0 tagged: + onboot: true type: vlan device: eth0.902 tags: diff --git a/overlays/wicked/internal/wicked_test.go b/overlays/wicked/internal/wicked_test.go index 7b835d07..ffa7c32b 100644 --- a/overlays/wicked/internal/wicked_test.go +++ b/overlays/wicked/internal/wicked_test.go @@ -65,7 +65,7 @@ This file is autogenerated by warewulf wwnet0 ethernet - boot + manual @@ -99,7 +99,7 @@ This file is autogenerated by warewulf wwnet1 ethernet - boot + manual diff --git a/overlays/wicked/rootfs/etc/wicked/ifconfig/ifcfg.xml.ww b/overlays/wicked/rootfs/etc/wicked/ifconfig/ifcfg.xml.ww index 19012c0d..4fd01a6a 100644 --- a/overlays/wicked/rootfs/etc/wicked/ifconfig/ifcfg.xml.ww +++ b/overlays/wicked/rootfs/etc/wicked/ifconfig/ifcfg.xml.ww @@ -18,7 +18,7 @@ This file is autogenerated by warewulf {{ $netdev.MTU }} {{- end }} - {{ if or $netdev.OnBoot (eq $netdev.OnBoot nil) }}boot{{ else }}manual{{end}} + {{ if $netdev.OnBoot }}boot{{ else }}manual{{ end }}