From dd1cf6f4a5623248a609da3cf62a564a72b9316b Mon Sep 17 00:00:00 2001 From: Gregory Kurtzer Date: Tue, 3 May 2022 21:53:47 -0700 Subject: [PATCH] Don't force LC on node set This makes it so we can never UNDEF/DELETE an entry as that requires upper case. So we are doing the lower case now where it matters. --- internal/app/wwctl/node/set/main.go | 2 +- internal/pkg/warewulfd/nodedb.go | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/internal/app/wwctl/node/set/main.go b/internal/app/wwctl/node/set/main.go index c41900d8..d3899afd 100644 --- a/internal/app/wwctl/node/set/main.go +++ b/internal/app/wwctl/node/set/main.go @@ -248,7 +248,7 @@ func CobraRunE(cmd *cobra.Command, args []string) error { } wwlog.Printf(wwlog.VERBOSE, "Node: %s:%s, Setting HW address to: %s\n", n.Id.Get(), SetNetName, SetHwaddr) - n.NetDevs[SetNetName].Hwaddr.Set(strings.ToLower(SetHwaddr)) + n.NetDevs[SetNetName].Hwaddr.Set(SetHwaddr) } if SetType != "" { diff --git a/internal/pkg/warewulfd/nodedb.go b/internal/pkg/warewulfd/nodedb.go index f5e05fe8..7ece9ea7 100644 --- a/internal/pkg/warewulfd/nodedb.go +++ b/internal/pkg/warewulfd/nodedb.go @@ -1,6 +1,7 @@ package warewulfd import ( + "strings" "sync" "github.com/pkg/errors" @@ -32,7 +33,8 @@ func LoadNodeDB() error { for _, n := range nodes { for _, netdev := range n.NetDevs { - TmpMap[netdev.Hwaddr.Get()] = n + hwaddr := strings.ToLower(netdev.Hwaddr.Get()) + TmpMap[hwaddr] = n } }