Return OnBoot to wwtype.WWbool

Signed-off-by: Jonathon Anderson <janderson@ciq.com>
2024-11-04 16:41:02 -07:00
parent a7325b6ffa
commit 8a602e8a76
11 changed files with 13 additions and 11 deletions
--- 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:
--- 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 }}
--- 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
--- 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 }}
--- 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
--- 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:
--- 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
--- 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:
--- a/overlays/wicked/internal/wicked_test.go
+++ b/overlays/wicked/internal/wicked_test.go
@@ -65,7 +65,7 @@ This file is autogenerated by warewulf
  <name>wwnet0</name>
  <link-type>ethernet</link-type>
  <control>
-    <mode>boot</mode>
+    <mode>manual</mode>
  </control>
  <firewall/>
  <link/>
@@ -99,7 +99,7 @@ This file is autogenerated by warewulf
  <name>wwnet1</name>
  <link-type>ethernet</link-type>
  <control>
-    <mode>boot</mode>
+    <mode>manual</mode>
  </control>
  <firewall/>
  <link/>
--- 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
  <mtu>{{ $netdev.MTU }}</mtu>
  {{- end }}
  <control>
-    <mode>{{ if or $netdev.OnBoot (eq $netdev.OnBoot nil) }}boot{{ else }}manual{{end}}</mode>
+    <mode>{{ if $netdev.OnBoot }}boot{{ else }}manual{{ end }}</mode>
  </control>
  <firewall/>
  <link/>