- updated to 4.5.5 with following changes: * mount `/sys` and `/run` on `wwctl container exec` to enabled SUSEConnect (bsc#1227289) * don't want on NIS style passwd line (bsc#1227250) * wwctl impoer can have `passwd` and `user` argument (bsc#1227340) * add net.ifnames=1 to default kernel parameters (bsc#1226654) - removed wwctl-configure-all-calls-SSH-keys.patch as included upstream - added following not yet accepted upstream patches: * empty-container.patch * enhanced-cont-list.patch * fix-overlay-built.patch * oci-vars.patch * issue-motd.patch OBS-URL: https://build.opensuse.org/request/show/1186422 OBS-URL: https://build.opensuse.org/package/show/network:cluster/warewulf4?expand=0&rev=79
22 lines
688 B
Diff
22 lines
688 B
Diff
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)
|