Christian Goll
a96684b791
(bsc#1225402) OBS-URL: https://build.opensuse.org/package/show/network:cluster/warewulf4?expand=0&rev=76
48 lines
1.5 KiB
Diff
48 lines
1.5 KiB
Diff
From 0096e0c37fa1a199f16945b6d99c69761257f27a Mon Sep 17 00:00:00 2001
|
|
From: Christian Goll <cgoll@suse.com>
|
|
Date: Mon, 27 May 2024 19:15:25 +0200
|
|
Subject: [PATCH] wwctl configure --all calls SSH(keys)
|
|
|
|
Signed-off-by: Christian Goll <cgoll@suse.com>
|
|
---
|
|
CHANGELOG.md | 1 +
|
|
internal/app/wwctl/configure/main.go | 3 ++-
|
|
2 files changed, 3 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/CHANGELOG.md b/CHANGELOG.md
|
|
index 31ed0088..0526f6dd 100644
|
|
--- a/CHANGELOG.md
|
|
+++ b/CHANGELOG.md
|
|
@@ -34,6 +34,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
|
|
`/sys/firmware/devicetree/base/serial-number`
|
|
- Replace slice in templates with sprig substr. #1093
|
|
- Block unprivileged requests for arbitrary overlays in secure mode.
|
|
+- Create ssh key also when calling `wwctl configure --all` #1250
|
|
|
|
## v4.5.2, 2024-05-13
|
|
|
|
diff --git a/internal/app/wwctl/configure/main.go b/internal/app/wwctl/configure/main.go
|
|
index c663dc71..fad8c4af 100644
|
|
--- a/internal/app/wwctl/configure/main.go
|
|
+++ b/internal/app/wwctl/configure/main.go
|
|
@@ -4,6 +4,7 @@ import (
|
|
"os"
|
|
|
|
"github.com/spf13/cobra"
|
|
+ warewulfconf "github.com/warewulf/warewulf/internal/pkg/config"
|
|
"github.com/warewulf/warewulf/internal/pkg/configure"
|
|
"github.com/warewulf/warewulf/internal/pkg/wwlog"
|
|
)
|
|
@@ -23,7 +24,7 @@ func CobraRunE(cmd *cobra.Command, args []string) error {
|
|
os.Exit(1)
|
|
}
|
|
|
|
- err = configure.SSH()
|
|
+ err = configure.SSH(warewulfconf.Get().SSH.KeyTypes...)
|
|
if err != nil {
|
|
wwlog.Error("%s", err)
|
|
os.Exit(1)
|
|
--
|
|
2.43.0
|
|
|