From c3b42778321633329e19705da97d13e2875292b3 Mon Sep 17 00:00:00 2001 From: Brian Clemens Date: Tue, 26 Jan 2021 19:41:45 +0900 Subject: [PATCH 1/3] Tag 4.0.0 --- Makefile | 2 ++ warewulf.spec.in | 2 ++ 2 files changed, 4 insertions(+) diff --git a/Makefile b/Makefile index 68bc64f0..ce3316ea 100644 --- a/Makefile +++ b/Makefile @@ -59,6 +59,8 @@ files: all mkdir -p $(DESTDIR)/var/warewulf/overlays/system/default/warewulf/bin/ cp wwclient $(DESTDIR)/var/warewulf/overlays/system/default/warewulf/bin/ cp wwctl $(DESTDIR)/usr/bin/ + mkdir -p $(DESTDIR)/usr/lib/systemd/system + install -c -m 0644 include/systemd/warewulfd.service $(DESTDIR)/usr/lib/systemd/system # cp -r tftpboot/* /var/lib/tftpboot/warewulf/ipxe/ # restorecon -r /var/lib/tftpboot/warewulf diff --git a/warewulf.spec.in b/warewulf.spec.in index 5e013b14..c6f3f519 100644 --- a/warewulf.spec.in +++ b/warewulf.spec.in @@ -43,3 +43,5 @@ rm -rf $RPM_BUILD_ROOT /var/warewulf %changelog +* Tue Jan 26 14:46:24 JST 2021 Brian Clemens - 4.0.0 +- Initial release From 33440ef66eba72a4c1cdbae673d5b0773377ef6a Mon Sep 17 00:00:00 2001 From: Niko Kivel Date: Tue, 26 Jan 2021 13:57:13 +0100 Subject: [PATCH 2/3] fixed wrong variabel for kernel arguments --- internal/app/wwctl/node/set/root.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/app/wwctl/node/set/root.go b/internal/app/wwctl/node/set/root.go index 0dfb6c35..7663a9b9 100644 --- a/internal/app/wwctl/node/set/root.go +++ b/internal/app/wwctl/node/set/root.go @@ -45,7 +45,7 @@ func init() { baseCmd.PersistentFlags().StringVar(&SetComment, "comment", "", "Set a comment for this node") baseCmd.PersistentFlags().StringVarP(&SetContainer, "container", "C", "", "Set the container (VNFS) for this node") baseCmd.PersistentFlags().StringVarP(&SetKernel, "kernel", "K", "", "Set Kernel version for nodes") - baseCmd.PersistentFlags().StringVarP(&SetKernel, "kernelargs", "A", "", "Set Kernel argument for nodes") + baseCmd.PersistentFlags().StringVarP(&SetKernelArgs, "kernelargs", "A", "", "Set Kernel argument for nodes") baseCmd.PersistentFlags().StringVarP(&SetClusterName, "cluster", "c", "", "Set the node's cluster group") baseCmd.PersistentFlags().StringVarP(&SetIpxe, "ipxe", "P", "", "Set the node's iPXE template name") baseCmd.PersistentFlags().StringVarP(&SetInit, "init", "i", "", "Define the init process to boot the container") From 1d396df05675987e61d831e6ca1bc9629ebc6464 Mon Sep 17 00:00:00 2001 From: Niko Kivel Date: Thu, 18 Mar 2021 11:30:33 +0100 Subject: [PATCH 3/3] fixed problems with wrongly identified invalid characters --- internal/pkg/container/util.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/pkg/container/util.go b/internal/pkg/container/util.go index a138b313..34e65de1 100644 --- a/internal/pkg/container/util.go +++ b/internal/pkg/container/util.go @@ -12,7 +12,7 @@ import ( ) func ValidName(name string) bool { - if util.ValidString(name, "^[a-zA-Z0-9.:-_]+$") == false { + if util.ValidString(name, "^[\\w\\-\\.\\:]+$") == false { wwlog.Printf(wwlog.WARN, "VNFS name has illegal characters: %s\n", name) return false }