From a5e79ae560542df0bc3bfe6596426785a417f5eb Mon Sep 17 00:00:00 2001 From: Gregory Kurtzer Date: Thu, 10 Dec 2020 20:57:02 -0800 Subject: [PATCH] Moved `wwctl service` to `wwctl system` --- internal/app/wwctl/root.go | 6 ++++-- internal/app/wwctl/{service => system}/dhcp/root.go | 0 internal/app/wwctl/{service => system}/root.go | 8 ++++---- internal/app/wwctl/{service => system}/tftp/root.go | 0 4 files changed, 8 insertions(+), 6 deletions(-) rename internal/app/wwctl/{service => system}/dhcp/root.go (100%) rename internal/app/wwctl/{service => system}/root.go (85%) rename internal/app/wwctl/{service => system}/tftp/root.go (100%) diff --git a/internal/app/wwctl/root.go b/internal/app/wwctl/root.go index 72119651..a8a0a2f0 100644 --- a/internal/app/wwctl/root.go +++ b/internal/app/wwctl/root.go @@ -7,7 +7,8 @@ import ( "github.com/hpcng/warewulf/internal/app/wwctl/overlay" "github.com/hpcng/warewulf/internal/app/wwctl/profile" "github.com/hpcng/warewulf/internal/app/wwctl/ready" - "github.com/hpcng/warewulf/internal/app/wwctl/service" + "github.com/hpcng/warewulf/internal/app/wwctl/server" + "github.com/hpcng/warewulf/internal/app/wwctl/system" "github.com/hpcng/warewulf/internal/pkg/wwlog" "github.com/spf13/cobra" @@ -37,8 +38,9 @@ func init() { rootCmd.AddCommand(kernel.GetCommand()) // rootCmd.AddCommand(group.GetCommand()) rootCmd.AddCommand(profile.GetCommand()) - rootCmd.AddCommand(service.GetCommand()) + rootCmd.AddCommand(system.GetCommand()) rootCmd.AddCommand(ready.GetCommand()) + rootCmd.AddCommand(server.GetCommand()) } diff --git a/internal/app/wwctl/service/dhcp/root.go b/internal/app/wwctl/system/dhcp/root.go similarity index 100% rename from internal/app/wwctl/service/dhcp/root.go rename to internal/app/wwctl/system/dhcp/root.go diff --git a/internal/app/wwctl/service/root.go b/internal/app/wwctl/system/root.go similarity index 85% rename from internal/app/wwctl/service/root.go rename to internal/app/wwctl/system/root.go index 55167a35..24dd050b 100644 --- a/internal/app/wwctl/service/root.go +++ b/internal/app/wwctl/system/root.go @@ -1,16 +1,16 @@ -package service +package system import ( "fmt" - "github.com/hpcng/warewulf/internal/app/wwctl/service/dhcp" - "github.com/hpcng/warewulf/internal/app/wwctl/service/tftp" + "github.com/hpcng/warewulf/internal/app/wwctl/system/dhcp" + "github.com/hpcng/warewulf/internal/app/wwctl/system/tftp" "github.com/spf13/cobra" "os" ) var ( baseCmd = &cobra.Command{ - Use: "service", + Use: "system", Short: "Initialize Warewulf services", Long: "Warewulf Service Initialization", RunE: CobraRunE, diff --git a/internal/app/wwctl/service/tftp/root.go b/internal/app/wwctl/system/tftp/root.go similarity index 100% rename from internal/app/wwctl/service/tftp/root.go rename to internal/app/wwctl/system/tftp/root.go