kelvin/warewulf
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Rename pkg/warewulfconf to pkg/config

Browse Source 
Signed-off-by: Jonathon Anderson <janderson@ciq.co>
This commit is contained in:
Jonathon Anderson
2023-04-14 14:23:18 -06:00
parent b6e6795dee
commit c461e65a98
38 changed files with 47 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
.gitignore vendored
View File

@@ -25,10 +25,11 @@
/etc/bash_completion.d/ /etc/bash_completion.d/
warewulf.spec warewulf.spec
internal/pkg/buildconfig/setconfigs.go internal/pkg/buildconfig/setconfigs.go
internal/pkg/warewulfconf/buildconfig.go internal/pkg/config/buildconfig.go
include/systemd/warewulfd.service include/systemd/warewulfd.service
_dist/ _dist/
config config
!internal/pkg/config
warewulf-*.tar.gz warewulf-*.tar.gz
Defaults.mk Defaults.mk
/etc/wwapid.config /etc/wwapid.config

8
Makefile
View File

@@ -151,7 +151,7 @@ vet:
go vet ./... go vet ./...
test-it: test-it:
go test -v ./... -ldflags="-X 'github.com/hpcng/warewulf/internal/pkg/warewulfconf.ConfigFile=$(shell pwd)/etc/warewulf.conf'" go test -v ./... -ldflags="-X 'github.com/hpcng/warewulf/internal/pkg/config.ConfigFile=$(shell pwd)/etc/warewulf.conf'"
# Generate test coverage # Generate test coverage
test-cover: ## Run test coverage and generate html report test-cover: ## Run test coverage and generate html report
@@ -219,13 +219,13 @@ init:
wwctl: $(WWCTL_DEPS) wwctl: $(WWCTL_DEPS)
@echo Building "$@" @echo Building "$@"
@cd cmd/wwctl; GOOS=linux go build -mod vendor -tags "$(WW_GO_BUILD_TAGS)" \ @cd cmd/wwctl; GOOS=linux go build -mod vendor -tags "$(WW_GO_BUILD_TAGS)" \
-ldflags "-X 'github.com/hpcng/warewulf/internal/pkg/warewulfconf.ConfigFile=$(SYSCONFDIR)/warewulf/warewulf.conf'" \ -ldflags "-X 'github.com/hpcng/warewulf/internal/pkg/config.ConfigFile=$(SYSCONFDIR)/warewulf/warewulf.conf'" \
-o ../../wwctl -o ../../wwctl
wwclient: $(WWCLIENT_DEPS) wwclient: $(WWCLIENT_DEPS)
@echo Building "$@" @echo Building "$@"
@cd cmd/wwclient; CGO_ENABLED=0 GOOS=linux go build -mod vendor -a -ldflags "-extldflags -static \ @cd cmd/wwclient; CGO_ENABLED=0 GOOS=linux go build -mod vendor -a -ldflags "-extldflags -static \
-X 'github.com/hpcng/warewulf/internal/pkg/warewulfconf.ConfigFile=/etc/warewulf/warewulf.conf'" -o ../../wwclient -X 'github.com/hpcng/warewulf/internal/pkg/config.ConfigFile=/etc/warewulf/warewulf.conf'" -o ../../wwclient
man_pages: wwctl man_pages: wwctl
@install -d man_pages @install -d man_pages
@@ -235,7 +235,7 @@ man_pages: wwctl
@cd man_pages; for i in wwctl*1 *.5; do gzip --force $$i; echo -n "$$i "; done; echo @cd man_pages; for i in wwctl*1 *.5; do gzip --force $$i; echo -n "$$i "; done; echo
update_configuration: vendor cmd/update_configuration/update_configuration.go update_configuration: vendor cmd/update_configuration/update_configuration.go
cd cmd/update_configuration && go build -ldflags="-X 'github.com/hpcng/warewulf/internal/pkg/warewulfconf.ConfigFile=./etc/warewulf.conf'\ cd cmd/update_configuration && go build -ldflags="-X 'github.com/hpcng/warewulf/internal/pkg/config.ConfigFile=./etc/warewulf.conf'\
-X 'github.com/hpcng/warewulf/internal/pkg/node.ConfigFile=./etc/nodes.conf'"\ -X 'github.com/hpcng/warewulf/internal/pkg/node.ConfigFile=./etc/nodes.conf'"\
-mod vendor -tags "$(WW_GO_BUILD_TAGS)" -o ../../update_configuration -mod vendor -tags "$(WW_GO_BUILD_TAGS)" -o ../../update_configuration

2
internal/app/api/wwapic/wwapic.go
View File

@@ -12,7 +12,7 @@ import (
"github.com/hpcng/warewulf/internal/pkg/api/apiconfig" "github.com/hpcng/warewulf/internal/pkg/api/apiconfig"
"github.com/hpcng/warewulf/internal/pkg/api/routes/wwapiv1" "github.com/hpcng/warewulf/internal/pkg/api/routes/wwapiv1"
"github.com/hpcng/warewulf/internal/pkg/warewulfconf" warewulfconf "github.com/hpcng/warewulf/internal/pkg/config"
"google.golang.org/grpc" "google.golang.org/grpc"
"google.golang.org/grpc/credentials" "google.golang.org/grpc/credentials"

4
internal/app/api/wwapid/wwapid.go
View File

@@ -16,7 +16,7 @@ import (
apinode "github.com/hpcng/warewulf/internal/pkg/api/node" apinode "github.com/hpcng/warewulf/internal/pkg/api/node"
"github.com/hpcng/warewulf/internal/pkg/api/routes/wwapiv1" "github.com/hpcng/warewulf/internal/pkg/api/routes/wwapiv1"
"github.com/hpcng/warewulf/internal/pkg/version" "github.com/hpcng/warewulf/internal/pkg/version"
"github.com/hpcng/warewulf/internal/pkg/warewulfconf" "github.com/hpcng/warewulf/internal/pkg/config"
"google.golang.org/grpc" "google.golang.org/grpc"
"google.golang.org/grpc/codes" "google.golang.org/grpc/codes"
"google.golang.org/grpc/credentials" "google.golang.org/grpc/credentials"
@@ -34,7 +34,7 @@ var apiVersion string
func main() { func main() {
log.Println("Server running") log.Println("Server running")
conf := warewulfconf.New() conf := config.New()
// Read the config file. // Read the config file.
config, err := apiconfig.NewServer(path.Join(conf.Paths.Sysconfdir, "warewulf/wwapid.conf")) config, err := apiconfig.NewServer(path.Join(conf.Paths.Sysconfdir, "warewulf/wwapid.conf"))
if err != nil { if err != nil {

2
internal/app/api/wwapird/wwapird.go
View File

@@ -18,7 +18,7 @@ import (
"google.golang.org/grpc/credentials/insecure" "google.golang.org/grpc/credentials/insecure"
"github.com/hpcng/warewulf/internal/pkg/api/apiconfig" "github.com/hpcng/warewulf/internal/pkg/api/apiconfig"
"github.com/hpcng/warewulf/internal/pkg/warewulfconf" warewulfconf "github.com/hpcng/warewulf/internal/pkg/config"
gw "github.com/hpcng/warewulf/internal/pkg/api/routes/wwapiv1" gw "github.com/hpcng/warewulf/internal/pkg/api/routes/wwapiv1"

2
internal/app/wwclient/root.go
View File

@@ -17,7 +17,7 @@ import (
"github.com/coreos/go-systemd/daemon" "github.com/coreos/go-systemd/daemon"
"github.com/google/uuid" "github.com/google/uuid"
"github.com/hpcng/warewulf/internal/pkg/pidfile" "github.com/hpcng/warewulf/internal/pkg/pidfile"
"github.com/hpcng/warewulf/internal/pkg/warewulfconf" warewulfconf "github.com/hpcng/warewulf/internal/pkg/config"
"github.com/hpcng/warewulf/internal/pkg/wwlog" "github.com/hpcng/warewulf/internal/pkg/wwlog"
"github.com/spf13/cobra" "github.com/spf13/cobra"
"github.com/talos-systems/go-smbios/smbios" "github.com/talos-systems/go-smbios/smbios"

2
internal/app/wwctl/container/exec/child/main.go
View File

@@ -15,7 +15,7 @@ import (
"github.com/hpcng/warewulf/internal/pkg/node" "github.com/hpcng/warewulf/internal/pkg/node"
"github.com/hpcng/warewulf/internal/pkg/overlay" "github.com/hpcng/warewulf/internal/pkg/overlay"
"github.com/hpcng/warewulf/internal/pkg/util" "github.com/hpcng/warewulf/internal/pkg/util"
"github.com/hpcng/warewulf/internal/pkg/warewulfconf" warewulfconf "github.com/hpcng/warewulf/internal/pkg/config"
"github.com/hpcng/warewulf/internal/pkg/wwlog" "github.com/hpcng/warewulf/internal/pkg/wwlog"
"github.com/pkg/errors" "github.com/pkg/errors"
"github.com/spf13/cobra" "github.com/spf13/cobra"

2
internal/app/wwctl/container/list/main_test.go
View File

@@ -10,7 +10,7 @@ import (
"github.com/hpcng/warewulf/internal/pkg/api/routes/wwapiv1" "github.com/hpcng/warewulf/internal/pkg/api/routes/wwapiv1"
"github.com/hpcng/warewulf/internal/pkg/node" "github.com/hpcng/warewulf/internal/pkg/node"
"github.com/hpcng/warewulf/internal/pkg/warewulfconf" warewulfconf "github.com/hpcng/warewulf/internal/pkg/config"
"github.com/hpcng/warewulf/internal/pkg/warewulfd" "github.com/hpcng/warewulf/internal/pkg/warewulfd"
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
) )

2
internal/app/wwctl/genconf/warewulfconf/print/main.go
View File

@@ -3,7 +3,7 @@ package print
import ( import (
"fmt" "fmt"
"github.com/hpcng/warewulf/internal/pkg/warewulfconf" warewulfconf "github.com/hpcng/warewulf/internal/pkg/config"
"github.com/spf13/cobra" "github.com/spf13/cobra"
"gopkg.in/yaml.v2" "gopkg.in/yaml.v2"
) )

2
internal/app/wwctl/node/add/main_test.go
View File

@@ -6,7 +6,7 @@ import (
"testing" "testing"
"github.com/hpcng/warewulf/internal/pkg/node" "github.com/hpcng/warewulf/internal/pkg/node"
"github.com/hpcng/warewulf/internal/pkg/warewulfconf" warewulfconf "github.com/hpcng/warewulf/internal/pkg/config"
"github.com/hpcng/warewulf/internal/pkg/warewulfd" "github.com/hpcng/warewulf/internal/pkg/warewulfd"
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
) )

2
internal/app/wwctl/node/list/main_test.go
View File

@@ -7,7 +7,7 @@ import (
"testing" "testing"
"github.com/hpcng/warewulf/internal/pkg/node" "github.com/hpcng/warewulf/internal/pkg/node"
"github.com/hpcng/warewulf/internal/pkg/warewulfconf" warewulfconf "github.com/hpcng/warewulf/internal/pkg/config"
"github.com/hpcng/warewulf/internal/pkg/warewulfd" "github.com/hpcng/warewulf/internal/pkg/warewulfd"
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
) )

2
internal/app/wwctl/node/status/main.go
View File

@@ -9,7 +9,7 @@ import (
"github.com/fatih/color" "github.com/fatih/color"
apinode "github.com/hpcng/warewulf/internal/pkg/api/node" apinode "github.com/hpcng/warewulf/internal/pkg/api/node"
"github.com/hpcng/warewulf/internal/pkg/api/routes/wwapiv1" "github.com/hpcng/warewulf/internal/pkg/api/routes/wwapiv1"
"github.com/hpcng/warewulf/internal/pkg/warewulfconf" warewulfconf "github.com/hpcng/warewulf/internal/pkg/config"
"github.com/hpcng/warewulf/internal/pkg/wwlog" "github.com/hpcng/warewulf/internal/pkg/wwlog"
"github.com/hpcng/warewulf/pkg/hostlist" "github.com/hpcng/warewulf/pkg/hostlist"
"github.com/spf13/cobra" "github.com/spf13/cobra"

2
internal/app/wwctl/overlay/build/main.go
View File

@@ -7,7 +7,7 @@ import (
"github.com/hpcng/warewulf/internal/pkg/node" "github.com/hpcng/warewulf/internal/pkg/node"
"github.com/hpcng/warewulf/internal/pkg/overlay" "github.com/hpcng/warewulf/internal/pkg/overlay"
"github.com/hpcng/warewulf/internal/pkg/warewulfconf" warewulfconf "github.com/hpcng/warewulf/internal/pkg/config"
"github.com/hpcng/warewulf/internal/pkg/wwlog" "github.com/hpcng/warewulf/internal/pkg/wwlog"
"github.com/hpcng/warewulf/pkg/hostlist" "github.com/hpcng/warewulf/pkg/hostlist"
"github.com/spf13/cobra" "github.com/spf13/cobra"

2
internal/app/wwctl/profile/list/main_test.go
View File

@@ -8,7 +8,7 @@ import (
"testing" "testing"
"github.com/hpcng/warewulf/internal/pkg/node" "github.com/hpcng/warewulf/internal/pkg/node"
"github.com/hpcng/warewulf/internal/pkg/warewulfconf" warewulfconf "github.com/hpcng/warewulf/internal/pkg/config"
"github.com/hpcng/warewulf/internal/pkg/warewulfd" "github.com/hpcng/warewulf/internal/pkg/warewulfd"
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
) )

2
internal/app/wwctl/root.go
View File

@@ -15,7 +15,7 @@ import (
"github.com/hpcng/warewulf/internal/app/wwctl/ssh" "github.com/hpcng/warewulf/internal/app/wwctl/ssh"
"github.com/hpcng/warewulf/internal/app/wwctl/version" "github.com/hpcng/warewulf/internal/app/wwctl/version"
"github.com/hpcng/warewulf/internal/pkg/help" "github.com/hpcng/warewulf/internal/pkg/help"
"github.com/hpcng/warewulf/internal/pkg/warewulfconf" warewulfconf "github.com/hpcng/warewulf/internal/pkg/config"
"github.com/hpcng/warewulf/internal/pkg/wwlog" "github.com/hpcng/warewulf/internal/pkg/wwlog"
"github.com/spf13/cobra" "github.com/spf13/cobra"
) )

2
internal/app/wwctl/server/start/main.go
View File

@@ -1,7 +1,7 @@
package start package start
import ( import (
"github.com/hpcng/warewulf/internal/pkg/warewulfconf" warewulfconf "github.com/hpcng/warewulf/internal/pkg/config"
"github.com/hpcng/warewulf/internal/pkg/warewulfd" "github.com/hpcng/warewulf/internal/pkg/warewulfd"
"github.com/pkg/errors" "github.com/pkg/errors"
"github.com/spf13/cobra" "github.com/spf13/cobra"

2
internal/pkg/api/node/node.go
View File

@@ -10,7 +10,7 @@ import (
"github.com/hpcng/warewulf/internal/pkg/api/routes/wwapiv1" "github.com/hpcng/warewulf/internal/pkg/api/routes/wwapiv1"
"github.com/hpcng/warewulf/internal/pkg/node" "github.com/hpcng/warewulf/internal/pkg/node"
"github.com/hpcng/warewulf/internal/pkg/util" "github.com/hpcng/warewulf/internal/pkg/util"
"github.com/hpcng/warewulf/internal/pkg/warewulfconf" warewulfconf "github.com/hpcng/warewulf/internal/pkg/config"
"github.com/hpcng/warewulf/internal/pkg/wwlog" "github.com/hpcng/warewulf/internal/pkg/wwlog"
"github.com/hpcng/warewulf/pkg/hostlist" "github.com/hpcng/warewulf/pkg/hostlist"
"github.com/pkg/errors" "github.com/pkg/errors"

2
internal/pkg/warewulfconf/buildconfig.go.in → internal/pkg/config/buildconfig.go.in
View File

@@ -1,4 +1,4 @@
package warewulfconf package config
type BuildConfig struct { type BuildConfig struct {
Bindir string `default:"@BINDIR@"` Bindir string `default:"@BINDIR@"`

2
internal/pkg/warewulfconf/constructors.go → internal/pkg/config/constructors.go
View File

@@ -1,4 +1,4 @@
package warewulfconf package config
import ( import (
"fmt" "fmt"

2
internal/pkg/warewulfconf/datastructure.go → internal/pkg/config/datastructure.go
View File

@@ -1,4 +1,4 @@
package warewulfconf package config
import ( import (
"github.com/creasty/defaults" "github.com/creasty/defaults"

2
internal/pkg/warewulfconf/modifiers.go → internal/pkg/config/modifiers.go
View File

@@ -1,4 +1,4 @@
package warewulfconf package config
import ( import (
"os" "os"

2
internal/pkg/configure/dhcp.go
View File

@@ -6,7 +6,7 @@ import (
"github.com/hpcng/warewulf/internal/pkg/overlay" "github.com/hpcng/warewulf/internal/pkg/overlay"
"github.com/hpcng/warewulf/internal/pkg/util" "github.com/hpcng/warewulf/internal/pkg/util"
"github.com/hpcng/warewulf/internal/pkg/warewulfconf" warewulfconf "github.com/hpcng/warewulf/internal/pkg/config"
"github.com/hpcng/warewulf/internal/pkg/wwlog" "github.com/hpcng/warewulf/internal/pkg/wwlog"
"github.com/pkg/errors" "github.com/pkg/errors"
) )

2
internal/pkg/configure/nfs.go
View File

@@ -5,7 +5,7 @@ import (
"github.com/hpcng/warewulf/internal/pkg/overlay" "github.com/hpcng/warewulf/internal/pkg/overlay"
"github.com/hpcng/warewulf/internal/pkg/util" "github.com/hpcng/warewulf/internal/pkg/util"
"github.com/hpcng/warewulf/internal/pkg/warewulfconf" warewulfconf "github.com/hpcng/warewulf/internal/pkg/config"
"github.com/hpcng/warewulf/internal/pkg/wwlog" "github.com/hpcng/warewulf/internal/pkg/wwlog"
"github.com/pkg/errors" "github.com/pkg/errors"
) )

2
internal/pkg/configure/ssh.go
View File

@@ -6,7 +6,7 @@ import (
"path" "path"
"github.com/hpcng/warewulf/internal/pkg/util" "github.com/hpcng/warewulf/internal/pkg/util"
"github.com/hpcng/warewulf/internal/pkg/warewulfconf" warewulfconf "github.com/hpcng/warewulf/internal/pkg/config"
"github.com/hpcng/warewulf/internal/pkg/wwlog" "github.com/hpcng/warewulf/internal/pkg/wwlog"
"github.com/pkg/errors" "github.com/pkg/errors"
) )

2
internal/pkg/configure/tftp.go
View File

@@ -6,7 +6,7 @@ import (
"path" "path"
"github.com/hpcng/warewulf/internal/pkg/util" "github.com/hpcng/warewulf/internal/pkg/util"
"github.com/hpcng/warewulf/internal/pkg/warewulfconf" warewulfconf "github.com/hpcng/warewulf/internal/pkg/config"
"github.com/hpcng/warewulf/internal/pkg/wwlog" "github.com/hpcng/warewulf/internal/pkg/wwlog"
) )

2
internal/pkg/container/config.go
View File

@@ -3,7 +3,7 @@ package container
import ( import (
"path" "path"
"github.com/hpcng/warewulf/internal/pkg/warewulfconf" warewulfconf "github.com/hpcng/warewulf/internal/pkg/config"
) )
func SourceParentDir() string { func SourceParentDir() string {

2
internal/pkg/container/imprt.go
View File

@@ -9,7 +9,7 @@ import (
"github.com/containers/storage/drivers/copy" "github.com/containers/storage/drivers/copy"
"github.com/pkg/errors" "github.com/pkg/errors"
"github.com/hpcng/warewulf/internal/pkg/warewulfconf" warewulfconf "github.com/hpcng/warewulf/internal/pkg/config"
"github.com/hpcng/warewulf/internal/pkg/oci" "github.com/hpcng/warewulf/internal/pkg/oci"
"github.com/hpcng/warewulf/internal/pkg/util" "github.com/hpcng/warewulf/internal/pkg/util"
) )

2
internal/pkg/container/mountpoints.go
View File

@@ -3,7 +3,7 @@ package container
import ( import (
"strings" "strings"
"github.com/hpcng/warewulf/internal/pkg/warewulfconf" warewulfconf "github.com/hpcng/warewulf/internal/pkg/config"
"github.com/hpcng/warewulf/internal/pkg/wwlog" "github.com/hpcng/warewulf/internal/pkg/wwlog"
) )

2
internal/pkg/kernel/kernel.go
View File

@@ -12,7 +12,7 @@ import (
"github.com/pkg/errors" "github.com/pkg/errors"
"github.com/hpcng/warewulf/internal/pkg/util" "github.com/hpcng/warewulf/internal/pkg/util"
"github.com/hpcng/warewulf/internal/pkg/warewulfconf" warewulfconf "github.com/hpcng/warewulf/internal/pkg/config"
"github.com/hpcng/warewulf/internal/pkg/wwlog" "github.com/hpcng/warewulf/internal/pkg/wwlog"
) )

2
internal/pkg/node/constructors.go
View File

@@ -8,7 +8,7 @@ import (
"sort" "sort"
"strings" "strings"
"github.com/hpcng/warewulf/internal/pkg/warewulfconf" warewulfconf "github.com/hpcng/warewulf/internal/pkg/config"
"github.com/hpcng/warewulf/internal/pkg/wwlog" "github.com/hpcng/warewulf/internal/pkg/wwlog"
"gopkg.in/yaml.v2" "gopkg.in/yaml.v2"

6
internal/pkg/oci/defaults.go
View File

@@ -1,7 +1,9 @@
package oci package oci
import "github.com/hpcng/warewulf/internal/pkg/warewulfconf" import (
import "path/filepath" warewulfconf "github.com/hpcng/warewulf/internal/pkg/config"
"path/filepath"
)
var defaultCachePath = filepath.Join(warewulfconf.DataStore(), "/container-cache/oci/") var defaultCachePath = filepath.Join(warewulfconf.DataStore(), "/container-cache/oci/")

2
internal/pkg/overlay/config.go
View File

@@ -5,7 +5,7 @@ import (
"path" "path"
"strings" "strings"
"github.com/hpcng/warewulf/internal/pkg/warewulfconf" warewulfconf "github.com/hpcng/warewulf/internal/pkg/config"
) )
func OverlaySourceTopDir() string { func OverlaySourceTopDir() string {

2
internal/pkg/overlay/datastructure.go
View File

@@ -7,7 +7,7 @@ import (
"time" "time"
"github.com/hpcng/warewulf/internal/pkg/node" "github.com/hpcng/warewulf/internal/pkg/node"
"github.com/hpcng/warewulf/internal/pkg/warewulfconf" warewulfconf "github.com/hpcng/warewulf/internal/pkg/config"
"github.com/hpcng/warewulf/internal/pkg/wwlog" "github.com/hpcng/warewulf/internal/pkg/wwlog"
) )

2
internal/pkg/overlay/funcmap.go
View File

@@ -8,7 +8,7 @@ import (
"github.com/hpcng/warewulf/internal/pkg/container" "github.com/hpcng/warewulf/internal/pkg/container"
"github.com/hpcng/warewulf/internal/pkg/util" "github.com/hpcng/warewulf/internal/pkg/util"
"github.com/hpcng/warewulf/internal/pkg/warewulfconf" warewulfconf "github.com/hpcng/warewulf/internal/pkg/config"
"github.com/hpcng/warewulf/internal/pkg/wwlog" "github.com/hpcng/warewulf/internal/pkg/wwlog"
) )

2
internal/pkg/version/version.go
View File

@@ -4,7 +4,7 @@ import (
"fmt" "fmt"
"github.com/hpcng/warewulf/internal/pkg/api/routes/wwapiv1" "github.com/hpcng/warewulf/internal/pkg/api/routes/wwapiv1"
"github.com/hpcng/warewulf/internal/pkg/warewulfconf" warewulfconf "github.com/hpcng/warewulf/internal/pkg/config"
) )
/* /*

2
internal/pkg/warewulfd/daemon.go
View File

@@ -11,7 +11,7 @@ import (
"github.com/hpcng/warewulf/internal/pkg/util" "github.com/hpcng/warewulf/internal/pkg/util"
"github.com/hpcng/warewulf/internal/pkg/version" "github.com/hpcng/warewulf/internal/pkg/version"
"github.com/hpcng/warewulf/internal/pkg/warewulfconf" warewulfconf "github.com/hpcng/warewulf/internal/pkg/config"
"github.com/hpcng/warewulf/internal/pkg/wwlog" "github.com/hpcng/warewulf/internal/pkg/wwlog"
"github.com/pkg/errors" "github.com/pkg/errors"
) )

2
internal/pkg/warewulfd/provision.go
View File

@@ -10,7 +10,7 @@ import (
"github.com/hpcng/warewulf/internal/pkg/container" "github.com/hpcng/warewulf/internal/pkg/container"
"github.com/hpcng/warewulf/internal/pkg/kernel" "github.com/hpcng/warewulf/internal/pkg/kernel"
"github.com/hpcng/warewulf/internal/pkg/util" "github.com/hpcng/warewulf/internal/pkg/util"
"github.com/hpcng/warewulf/internal/pkg/warewulfconf" warewulfconf "github.com/hpcng/warewulf/internal/pkg/config"
"github.com/hpcng/warewulf/internal/pkg/wwlog" "github.com/hpcng/warewulf/internal/pkg/wwlog"
) )

2
internal/pkg/warewulfd/warewulfd.go
View File

@@ -7,7 +7,7 @@ import (
"strconv" "strconv"
"syscall" "syscall"
"github.com/hpcng/warewulf/internal/pkg/warewulfconf" warewulfconf "github.com/hpcng/warewulf/internal/pkg/config"
"github.com/hpcng/warewulf/internal/pkg/wwlog" "github.com/hpcng/warewulf/internal/pkg/wwlog"
"github.com/pkg/errors" "github.com/pkg/errors"
) )