kelvin/warewulf
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

better udev rules

Browse Source 
Renamed 70-ww4-netname.rules.ww to 70-persistent-net.rules.ww.

Signed-off-by: Christian Goll <cgoll@suse.com>
This commit is contained in:
Christian Goll
2024-06-21 17:29:58 +02:00
committed by Jonathon Anderson
parent 2e51d68893
commit d1c734732f
6 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
overlays/udev.netname/internal/udev_netname_test.go
View File

@@ -14,7 +14,7 @@ func Test_udev_netnameOverlay(t *testing.T) {
env := testenv.New(t)
defer env.RemoveAll(t)
env.ImportFile(t, "etc/warewulf/nodes.conf", "nodes.conf")
env.ImportFile(t, "var/lib/warewulf/overlays/udev.netname/rootfs/etc/udev/rules.d/70-ww4-netname.rules.ww", "../rootfs/etc/udev/rules.d/70-ww4-netname.rules.ww")
env.ImportFile(t, "var/lib/warewulf/overlays/udev.netname/rootfs/etc/udev/rules.d/70-persistent-net.rules.ww", "../rootfs/etc/udev/rules.d/70-persistent-net.rules.ww")
tests := []struct {
name string
@@ -23,7 +23,7 @@ func Test_udev_netnameOverlay(t *testing.T) {
}{
{
name: "udev.netname",
args: []string{"--render", "node1", "udev.netname", "etc/udev/rules.d/70-ww4-netname.rules.ww"},
args: []string{"--render", "node1", "udev.netname", "etc/udev/rules.d/70-persistent-net.rules.ww"},
log: udev_netname,
},
}
@@ -49,7 +49,7 @@ func Test_udev_netnameOverlay(t *testing.T) {
const udev_netname string = `backupFile: true
writeFile: true
Filename: etc/udev/rules.d/70-ww4-netname.rules
Filename: etc/udev/rules.d/70-persistent-net.rules
# This file is autogenerated by warewulf
SUBSYSTEM=="net", ACTION=="add", ATTR{address}=="e6:92:39:49:7b:03", NAME="wwnet0"

4
overlays/udev.netname/rootfs/etc/udev/rules.d/70-ww4-netname.rules.ww → overlays/udev.netname/rootfs/etc/udev/rules.d/70-persistent-net.rules.ww
View File

@@ -1,6 +1,10 @@
# This file is autogenerated by warewulf
{{range $devname, $netdev := .NetDevs}}
{{- if $netdev.Hwaddr }}
{{- if eq $netdev.Type "infiniband" }}
SUBSYSTEM=="net", ACTION=="add", ATTR{address}=="?*{{ $netdev.Hwaddr }}", NAME="{{ $netdev.Device }}"
{{- else }}
SUBSYSTEM=="net", ACTION=="add", ATTR{address}=="{{ $netdev.Hwaddr }}", NAME="{{ $netdev.Device }}"
{{ end -}}
{{ end -}}
{{ end -}}