From 77c757b5d4ffdc3af13a81cc30f10620fa7a2973 Mon Sep 17 00:00:00 2001 From: Gregory Kurtzer Date: Wed, 26 Jan 2022 03:46:03 +0000 Subject: [PATCH 1/3] Always boot the default network device --- .../wwinit/etc/sysconfig/network-scripts/ifcfg-default.ww | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/overlays/wwinit/etc/sysconfig/network-scripts/ifcfg-default.ww b/overlays/wwinit/etc/sysconfig/network-scripts/ifcfg-default.ww index ba4c377d..3d499b00 100644 --- a/overlays/wwinit/etc/sysconfig/network-scripts/ifcfg-default.ww +++ b/overlays/wwinit/etc/sysconfig/network-scripts/ifcfg-default.ww @@ -6,8 +6,4 @@ IPADDR={{$.NetDevs.default.Ipaddr}} NETMASK={{$.NetDevs.default.Netmask}} GATEWAY={{$.NetDevs.default.Gateway}} HWADDR={{$.NetDevs.default.Hwaddr}} -{{- if $.NetDevs.default.OnBoot}} -ONBOOT=yes -{{- else}} -ONBOOT=no -{{- end}} +ONBOOT=yes \ No newline at end of file From af32998c2b1497a77330d14f93b055d17289671b Mon Sep 17 00:00:00 2001 From: Gregory Kurtzer Date: Wed, 26 Jan 2022 03:46:22 +0000 Subject: [PATCH 2/3] Fix some of the install paths --- Makefile | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index bdd53e22..71d00d4d 100644 --- a/Makefile +++ b/Makefile @@ -136,7 +136,6 @@ files: all install -d -m 0755 $(DESTDIR)$(WWCHROOTDIR) install -d -m 0755 $(DESTDIR)$(WWPROVISIONDIR) install -d -m 0755 $(DESTDIR)$(WWOVERLAYDIR) - install -d -m 0755 $(DESTDIR)$(WWOVERLAYDIR)/wwinit/bin/ install -d -m 0755 $(DESTDIR)$(WWOVERLAYDIR)/wwinit/warewulf/bin/ install -d -m 0755 $(DESTDIR)$(SYSCONFDIR)/warewulf/ install -d -m 0755 $(DESTDIR)$(SYSCONFDIR)/warewulf/ipxe @@ -152,6 +151,7 @@ files: all cp -r etc/ipxe $(DESTDIR)$(SYSCONFDIR)/warewulf/ cp -r overlays/* $(DESTDIR)$(WWOVERLAYDIR)/ chmod 755 $(DESTDIR)$(WWOVERLAYDIR)/wwinit/init + chmod 755 $(DESTDIR)$(WWOVERLAYDIR)/wwinit/warewulf/wwinit chmod 600 $(DESTDIR)$(WWOVERLAYDIR)/wwinit/etc/ssh/ssh* chmod 644 $(DESTDIR)$(WWOVERLAYDIR)/wwinit/etc/ssh/ssh*.pub.ww install -m 0755 wwctl $(DESTDIR)$(BINDIR) @@ -177,10 +177,11 @@ wwctl: cd cmd/wwctl; GOOS=linux go build -mod vendor -tags "$(WW_BUILD_GO_BUILD_TAGS)" -o ../../wwctl wwclient: - cd cmd/wwclient; CGO_ENABLED=0 GOOS=linux go build -mod vendor -a -ldflags '-extldflags -static' -o ../../wwclient + cd cmd/wwclient; CGO_ENABLED=0 GOOS=linux go build -mod vendor -a -ldflags "-extldflags -static \ + -X 'github.com/hpcng/warewulf/internal/pkg/warewulfconf.ConfigFile=/etc/warewulf/warewulf.conf'" -o ../../wwclient install_wwclient: wwclient - install -m 0755 wwclient $(DESTDIR)$(WWOVERLAYDIR)/wwinit/bin/wwclient + install -m 0755 wwclient $(DESTDIR)$(WWOVERLAYDIR)/wwinit/warewulf/bin/wwclient bash_completion: From 2d880aae76f19609dc0c0d1a5c56262bd5cbe3df Mon Sep 17 00:00:00 2001 From: Gregory Kurtzer Date: Wed, 26 Jan 2022 03:46:39 +0000 Subject: [PATCH 3/3] Properly support relative paths to the SYSCONFDIR --- internal/pkg/overlay/funcmap.go | 10 +++++++--- overlays/wwinit/etc/ssh/ssh_host_dsa_key.pub.ww | 2 +- overlays/wwinit/etc/ssh/ssh_host_dsa_key.ww | 2 +- overlays/wwinit/etc/ssh/ssh_host_ecdsa_key.pub.ww | 2 +- overlays/wwinit/etc/ssh/ssh_host_ecdsa_key.ww | 2 +- overlays/wwinit/etc/ssh/ssh_host_ed25519_key.pub.ww | 2 +- overlays/wwinit/etc/ssh/ssh_host_ed25519_key.ww | 2 +- overlays/wwinit/etc/ssh/ssh_host_rsa_key.pub.ww | 2 +- overlays/wwinit/etc/ssh/ssh_host_rsa_key.ww | 2 +- overlays/wwinit/etc/warewulf/warewulf.conf.ww | 2 +- 10 files changed, 16 insertions(+), 12 deletions(-) diff --git a/internal/pkg/overlay/funcmap.go b/internal/pkg/overlay/funcmap.go index 4bb4c118..b3279264 100644 --- a/internal/pkg/overlay/funcmap.go +++ b/internal/pkg/overlay/funcmap.go @@ -5,14 +5,18 @@ import ( "path" "strings" + "github.com/hpcng/warewulf/internal/pkg/buildconfig" "github.com/hpcng/warewulf/internal/pkg/container" "github.com/hpcng/warewulf/internal/pkg/util" "github.com/hpcng/warewulf/internal/pkg/wwlog" ) -func templateFileInclude(path string) string { - wwlog.Printf(wwlog.DEBUG, "Including file into template: %s\n", path) - content, err := ioutil.ReadFile(path) +func templateFileInclude(inc string) string { + if !strings.HasPrefix(inc, "/") { + inc = path.Join(buildconfig.SYSCONFDIR(), "warewulf", inc) + } + wwlog.Printf(wwlog.DEBUG, "Including file into template: %s\n", inc) + content, err := ioutil.ReadFile(inc) if err != nil { wwlog.Printf(wwlog.VERBOSE, "Could not include file into template: %s\n", err) } diff --git a/overlays/wwinit/etc/ssh/ssh_host_dsa_key.pub.ww b/overlays/wwinit/etc/ssh/ssh_host_dsa_key.pub.ww index 4bb82192..25b4ab26 100644 --- a/overlays/wwinit/etc/ssh/ssh_host_dsa_key.pub.ww +++ b/overlays/wwinit/etc/ssh/ssh_host_dsa_key.pub.ww @@ -1 +1 @@ -{{Include "/etc/warewulf/keys/ssh_host_dsa_key.pub"}} +{{Include "keys/ssh_host_dsa_key.pub"}} diff --git a/overlays/wwinit/etc/ssh/ssh_host_dsa_key.ww b/overlays/wwinit/etc/ssh/ssh_host_dsa_key.ww index 581f48f4..82ab4701 100644 --- a/overlays/wwinit/etc/ssh/ssh_host_dsa_key.ww +++ b/overlays/wwinit/etc/ssh/ssh_host_dsa_key.ww @@ -1 +1 @@ -{{Include "/etc/warewulf/keys/ssh_host_dsa_key"}} +{{Include "keys/ssh_host_dsa_key"}} diff --git a/overlays/wwinit/etc/ssh/ssh_host_ecdsa_key.pub.ww b/overlays/wwinit/etc/ssh/ssh_host_ecdsa_key.pub.ww index b6d9aa89..4229b16e 100644 --- a/overlays/wwinit/etc/ssh/ssh_host_ecdsa_key.pub.ww +++ b/overlays/wwinit/etc/ssh/ssh_host_ecdsa_key.pub.ww @@ -1 +1 @@ -{{Include "/etc/warewulf/keys/ssh_host_ecdsa_key.pub"}} +{{Include "keys/ssh_host_ecdsa_key.pub"}} diff --git a/overlays/wwinit/etc/ssh/ssh_host_ecdsa_key.ww b/overlays/wwinit/etc/ssh/ssh_host_ecdsa_key.ww index fbf8934c..a65e0b82 100644 --- a/overlays/wwinit/etc/ssh/ssh_host_ecdsa_key.ww +++ b/overlays/wwinit/etc/ssh/ssh_host_ecdsa_key.ww @@ -1 +1 @@ -{{Include "/etc/warewulf/keys/ssh_host_ecdsa_key"}} +{{Include "keys/ssh_host_ecdsa_key"}} diff --git a/overlays/wwinit/etc/ssh/ssh_host_ed25519_key.pub.ww b/overlays/wwinit/etc/ssh/ssh_host_ed25519_key.pub.ww index 76dbcfdb..de6364f4 100644 --- a/overlays/wwinit/etc/ssh/ssh_host_ed25519_key.pub.ww +++ b/overlays/wwinit/etc/ssh/ssh_host_ed25519_key.pub.ww @@ -1 +1 @@ -{{Include "/etc/warewulf/keys/ssh_host_ed25519_key.pub"}} +{{Include "keys/ssh_host_ed25519_key.pub"}} diff --git a/overlays/wwinit/etc/ssh/ssh_host_ed25519_key.ww b/overlays/wwinit/etc/ssh/ssh_host_ed25519_key.ww index e6dec541..a3c2674c 100644 --- a/overlays/wwinit/etc/ssh/ssh_host_ed25519_key.ww +++ b/overlays/wwinit/etc/ssh/ssh_host_ed25519_key.ww @@ -1 +1 @@ -{{Include "/etc/warewulf/keys/ssh_host_ed25519_key"}} +{{Include "keys/ssh_host_ed25519_key"}} diff --git a/overlays/wwinit/etc/ssh/ssh_host_rsa_key.pub.ww b/overlays/wwinit/etc/ssh/ssh_host_rsa_key.pub.ww index d5b09fa8..db06bb4b 100644 --- a/overlays/wwinit/etc/ssh/ssh_host_rsa_key.pub.ww +++ b/overlays/wwinit/etc/ssh/ssh_host_rsa_key.pub.ww @@ -1 +1 @@ -{{Include "/etc/warewulf/keys/ssh_host_rsa_key.pub"}} +{{Include "keys/ssh_host_rsa_key.pub"}} diff --git a/overlays/wwinit/etc/ssh/ssh_host_rsa_key.ww b/overlays/wwinit/etc/ssh/ssh_host_rsa_key.ww index feffaad5..877d0601 100644 --- a/overlays/wwinit/etc/ssh/ssh_host_rsa_key.ww +++ b/overlays/wwinit/etc/ssh/ssh_host_rsa_key.ww @@ -1 +1 @@ -{{Include "/etc/warewulf/keys/ssh_host_rsa_key"}} +{{Include "keys/ssh_host_rsa_key"}} diff --git a/overlays/wwinit/etc/warewulf/warewulf.conf.ww b/overlays/wwinit/etc/warewulf/warewulf.conf.ww index df0e916e..e1fba08c 100644 --- a/overlays/wwinit/etc/warewulf/warewulf.conf.ww +++ b/overlays/wwinit/etc/warewulf/warewulf.conf.ww @@ -1 +1 @@ -{{Include "/etc/warewulf/warewulf.conf"}} +{{Include "warewulf.conf"}}