Merge branch 'main' of github.com:hpcng/warewulf into overlay_refactor

internal/pkg/node/constructors.go

@@ -87,7 +87,11 @@ func (config *nodeYaml) FindAllNodes() ([]NodeInfo, error) {
 				n.NetDevs[devname] = &netdev
 			}
 
-			n.NetDevs[devname].Device.Set(netdev.Device)
+			if netdev.Device != "" {
+				n.NetDevs[devname].Device.Set(netdev.Device)
+			} else {
+				n.NetDevs[devname].Device.Set(devname)
+			}
 			n.NetDevs[devname].Ipaddr.Set(netdev.Ipaddr)
 			n.NetDevs[devname].Netmask.Set(netdev.Netmask)
 			n.NetDevs[devname].Hwaddr.Set(netdev.Hwaddr)

internal/pkg/node/methods.go

@@ -10,16 +10,20 @@ import "regexp"
 
 func FilterByName(set []NodeInfo, searchList []string) []NodeInfo {
 	var ret []NodeInfo
+	unique := make(map[string]NodeInfo)
 
 	if len(searchList) > 0 {
 		for _, search := range searchList {
 			for _, entry := range set {
 				b, _ := regexp.MatchString("^"+search+"$", entry.Id.Get())
 				if b {
-					ret = append(ret, entry)
+					unique[entry.Id.Get()] = entry
 				}
 			}
 		}
+		for _, n := range unique {
+			ret = append(ret, n)
+		}
 	} else {
 		ret = set
 	}