From 70735c144f59d0db0cd5a15d57c14879a3b73cde Mon Sep 17 00:00:00 2001 From: Niko Kivel Date: Wed, 27 Jan 2021 15:36:59 +0100 Subject: [PATCH] dhcpPersist variable, update wwctl services to wwctl configure in default confs * fixed wrong variable for kernel arguments * fixed wrong variable for persistence * fixed recreate command hint --- etc/dhcp/default-dhcpd.conf | 2 +- etc/dhcp/static-dhcpd.conf | 2 +- internal/app/wwctl/configure/dhcp/root.go | 2 +- warewulf.spec.in | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/etc/dhcp/default-dhcpd.conf b/etc/dhcp/default-dhcpd.conf index a02c1559..de193dc2 100644 --- a/etc/dhcp/default-dhcpd.conf +++ b/etc/dhcp/default-dhcpd.conf @@ -1,6 +1,6 @@ # This file is created and was written by a Warewulf template. It is strongly # suggested that you do not edit this file, but rather, edit the template and -# recreate this file using Warewulf (wwctl services dhcp) +# recreate this file using Warewulf (wwctl configure dhcp) allow booting; allow bootp; diff --git a/etc/dhcp/static-dhcpd.conf b/etc/dhcp/static-dhcpd.conf index 0175ab2f..ac1a9fc2 100644 --- a/etc/dhcp/static-dhcpd.conf +++ b/etc/dhcp/static-dhcpd.conf @@ -1,6 +1,6 @@ # This file is created and was written by a Warewulf template. It is strongly # suggested that you do not edit this file, but rather, edit the template and -# recreate this file using Warewulf (wwctl services dhcp) +# recreate this file using Warewulf (wwctl configure dhcp) allow booting; allow bootp; diff --git a/internal/app/wwctl/configure/dhcp/root.go b/internal/app/wwctl/configure/dhcp/root.go index dfd0c30a..8ed14596 100644 --- a/internal/app/wwctl/configure/dhcp/root.go +++ b/internal/app/wwctl/configure/dhcp/root.go @@ -18,7 +18,7 @@ var ( func init() { baseCmd.PersistentFlags().BoolVarP(&SetShow, "show", "s", false, "Show configuration (don't update)") - baseCmd.PersistentFlags().BoolVar(&SetShow, "persist", false, "Persist the configuration and initialize the service") + baseCmd.PersistentFlags().BoolVar(&SetPersist, "persist", false, "Persist the configuration and initialize the service") } // GetRootCommand returns the root cobra.Command for the application. diff --git a/warewulf.spec.in b/warewulf.spec.in index 11931f9d..5eb87cc7 100644 --- a/warewulf.spec.in +++ b/warewulf.spec.in @@ -45,4 +45,4 @@ rm -rf $RPM_BUILD_ROOT %changelog * Tue Jan 26 14:46:24 JST 2021 Brian Clemens - 4.0.0 -- Initial release +- Initial release \ No newline at end of file