From fcd654af80d56ea7c7d8706021577ff8bcef2bb4 Mon Sep 17 00:00:00 2001 From: Gregory Kurtzer Date: Sat, 23 Oct 2021 08:52:43 -0700 Subject: [PATCH] Fixups for new network device naming --- internal/pkg/overlay/overlay.go | 3 +++ .../etc/sysconfig/network-scripts/ifcfg-default.ww | 8 ++++---- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/internal/pkg/overlay/overlay.go b/internal/pkg/overlay/overlay.go index f865982b..b59b5ff1 100644 --- a/internal/pkg/overlay/overlay.go +++ b/internal/pkg/overlay/overlay.go @@ -161,11 +161,14 @@ func buildOverlay(nodeList []node.NodeInfo, overlayType string) error { var nd node.NetDevs t.NetDevs[devname] = &nd t.NetDevs[devname].Name = devname + t.NetDevs[devname].Device = netdev.Device.Get() t.NetDevs[devname].Hwaddr = netdev.Hwaddr.Get() t.NetDevs[devname].Ipaddr = netdev.Ipaddr.Get() t.NetDevs[devname].Netmask = netdev.Netmask.Get() t.NetDevs[devname].Gateway = netdev.Gateway.Get() t.NetDevs[devname].Type = netdev.Type.Get() + t.NetDevs[devname].OnBoot = netdev.OnBoot.GetB() + mask := net.IPMask(net.ParseIP(netdev.Netmask.Get()).To4()) ipaddr := net.ParseIP(netdev.Ipaddr.Get()).To4() netaddr := net.IPNet{IP: ipaddr, Mask: mask} diff --git a/overlays/system/default/etc/sysconfig/network-scripts/ifcfg-default.ww b/overlays/system/default/etc/sysconfig/network-scripts/ifcfg-default.ww index ea81303e..ba4c377d 100644 --- a/overlays/system/default/etc/sysconfig/network-scripts/ifcfg-default.ww +++ b/overlays/system/default/etc/sysconfig/network-scripts/ifcfg-default.ww @@ -1,4 +1,4 @@ -DEVICE={{.NetDevs.default.Device}} +DEVICE={{$.NetDevs.default.Device}} NAME=default BOOTPROTO=static DEVTIMEOUT=10 @@ -6,8 +6,8 @@ IPADDR={{$.NetDevs.default.Ipaddr}} NETMASK={{$.NetDevs.default.Netmask}} GATEWAY={{$.NetDevs.default.Gateway}} HWADDR={{$.NetDevs.default.Hwaddr}} -{{if eq $.NetDevs.default.OnBoot "true"}} +{{- if $.NetDevs.default.OnBoot}} ONBOOT=yes -{{else}} +{{- else}} ONBOOT=no -{{end}} \ No newline at end of file +{{- end}}