diff --git a/.gitignore b/.gitignore index 18b9454f..894fa86d 100644 --- a/.gitignore +++ b/.gitignore @@ -25,10 +25,11 @@ /etc/bash_completion.d/ warewulf.spec internal/pkg/buildconfig/setconfigs.go -internal/pkg/warewulfconf/buildconfig.go +internal/pkg/config/buildconfig.go include/systemd/warewulfd.service _dist/ config +!internal/pkg/config warewulf-*.tar.gz Defaults.mk /etc/wwapid.config diff --git a/Makefile b/Makefile index 36e36d98..a9fc7dd2 100644 --- a/Makefile +++ b/Makefile @@ -151,7 +151,7 @@ vet: go vet ./... 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 test-cover: ## Run test coverage and generate html report @@ -219,13 +219,13 @@ init: wwctl: $(WWCTL_DEPS) @echo Building "$@" @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 wwclient: $(WWCLIENT_DEPS) @echo Building "$@" @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 @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 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'"\ -mod vendor -tags "$(WW_GO_BUILD_TAGS)" -o ../../update_configuration diff --git a/internal/app/api/wwapic/wwapic.go b/internal/app/api/wwapic/wwapic.go index 36cfb002..fc34659c 100644 --- a/internal/app/api/wwapic/wwapic.go +++ b/internal/app/api/wwapic/wwapic.go @@ -12,7 +12,7 @@ import ( "github.com/hpcng/warewulf/internal/pkg/api/apiconfig" "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/credentials" diff --git a/internal/app/api/wwapid/wwapid.go b/internal/app/api/wwapid/wwapid.go index ce7457e5..33de9db6 100644 --- a/internal/app/api/wwapid/wwapid.go +++ b/internal/app/api/wwapid/wwapid.go @@ -16,7 +16,7 @@ import ( apinode "github.com/hpcng/warewulf/internal/pkg/api/node" "github.com/hpcng/warewulf/internal/pkg/api/routes/wwapiv1" "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/codes" "google.golang.org/grpc/credentials" @@ -34,7 +34,7 @@ var apiVersion string func main() { log.Println("Server running") - conf := warewulfconf.New() + conf := config.New() // Read the config file. config, err := apiconfig.NewServer(path.Join(conf.Paths.Sysconfdir, "warewulf/wwapid.conf")) if err != nil { diff --git a/internal/app/api/wwapird/wwapird.go b/internal/app/api/wwapird/wwapird.go index e9b210ac..c71f56e8 100644 --- a/internal/app/api/wwapird/wwapird.go +++ b/internal/app/api/wwapird/wwapird.go @@ -18,7 +18,7 @@ import ( "google.golang.org/grpc/credentials/insecure" "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" diff --git a/internal/app/wwclient/root.go b/internal/app/wwclient/root.go index b63f3f41..70167b2f 100644 --- a/internal/app/wwclient/root.go +++ b/internal/app/wwclient/root.go @@ -17,7 +17,7 @@ import ( "github.com/coreos/go-systemd/daemon" "github.com/google/uuid" "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/spf13/cobra" "github.com/talos-systems/go-smbios/smbios" diff --git a/internal/app/wwctl/container/exec/child/main.go b/internal/app/wwctl/container/exec/child/main.go index 9b62b507..3693e03f 100644 --- a/internal/app/wwctl/container/exec/child/main.go +++ b/internal/app/wwctl/container/exec/child/main.go @@ -15,7 +15,7 @@ import ( "github.com/hpcng/warewulf/internal/pkg/node" "github.com/hpcng/warewulf/internal/pkg/overlay" "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/pkg/errors" "github.com/spf13/cobra" diff --git a/internal/app/wwctl/container/list/main_test.go b/internal/app/wwctl/container/list/main_test.go index f87702e9..160a48dc 100644 --- a/internal/app/wwctl/container/list/main_test.go +++ b/internal/app/wwctl/container/list/main_test.go @@ -10,7 +10,7 @@ import ( "github.com/hpcng/warewulf/internal/pkg/api/routes/wwapiv1" "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/stretchr/testify/assert" ) diff --git a/internal/app/wwctl/genconf/warewulfconf/print/main.go b/internal/app/wwctl/genconf/warewulfconf/print/main.go index 2efca477..26cab821 100644 --- a/internal/app/wwctl/genconf/warewulfconf/print/main.go +++ b/internal/app/wwctl/genconf/warewulfconf/print/main.go @@ -3,7 +3,7 @@ package print import ( "fmt" - "github.com/hpcng/warewulf/internal/pkg/warewulfconf" + warewulfconf "github.com/hpcng/warewulf/internal/pkg/config" "github.com/spf13/cobra" "gopkg.in/yaml.v2" ) diff --git a/internal/app/wwctl/node/add/main_test.go b/internal/app/wwctl/node/add/main_test.go index 6750cedf..95b14873 100644 --- a/internal/app/wwctl/node/add/main_test.go +++ b/internal/app/wwctl/node/add/main_test.go @@ -6,7 +6,7 @@ import ( "testing" "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/stretchr/testify/assert" ) diff --git a/internal/app/wwctl/node/list/main_test.go b/internal/app/wwctl/node/list/main_test.go index 7d0e5751..4178f2b0 100644 --- a/internal/app/wwctl/node/list/main_test.go +++ b/internal/app/wwctl/node/list/main_test.go @@ -7,7 +7,7 @@ import ( "testing" "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/stretchr/testify/assert" ) diff --git a/internal/app/wwctl/node/status/main.go b/internal/app/wwctl/node/status/main.go index 5d8cdef7..1d0dc6f9 100644 --- a/internal/app/wwctl/node/status/main.go +++ b/internal/app/wwctl/node/status/main.go @@ -9,7 +9,7 @@ import ( "github.com/fatih/color" apinode "github.com/hpcng/warewulf/internal/pkg/api/node" "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/pkg/hostlist" "github.com/spf13/cobra" diff --git a/internal/app/wwctl/overlay/build/main.go b/internal/app/wwctl/overlay/build/main.go index 556833c4..bb61b131 100644 --- a/internal/app/wwctl/overlay/build/main.go +++ b/internal/app/wwctl/overlay/build/main.go @@ -7,7 +7,7 @@ import ( "github.com/hpcng/warewulf/internal/pkg/node" "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/pkg/hostlist" "github.com/spf13/cobra" diff --git a/internal/app/wwctl/profile/list/main_test.go b/internal/app/wwctl/profile/list/main_test.go index 46f29d30..4f4efad3 100644 --- a/internal/app/wwctl/profile/list/main_test.go +++ b/internal/app/wwctl/profile/list/main_test.go @@ -8,7 +8,7 @@ import ( "testing" "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/stretchr/testify/assert" ) diff --git a/internal/app/wwctl/root.go b/internal/app/wwctl/root.go index 42f9e4e9..2717c72e 100644 --- a/internal/app/wwctl/root.go +++ b/internal/app/wwctl/root.go @@ -15,7 +15,7 @@ import ( "github.com/hpcng/warewulf/internal/app/wwctl/ssh" "github.com/hpcng/warewulf/internal/app/wwctl/version" "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/spf13/cobra" ) diff --git a/internal/app/wwctl/server/start/main.go b/internal/app/wwctl/server/start/main.go index 00429177..076e1695 100644 --- a/internal/app/wwctl/server/start/main.go +++ b/internal/app/wwctl/server/start/main.go @@ -1,7 +1,7 @@ package start 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/pkg/errors" "github.com/spf13/cobra" diff --git a/internal/pkg/api/node/node.go b/internal/pkg/api/node/node.go index 2c63d8db..8c5581ab 100644 --- a/internal/pkg/api/node/node.go +++ b/internal/pkg/api/node/node.go @@ -10,7 +10,7 @@ import ( "github.com/hpcng/warewulf/internal/pkg/api/routes/wwapiv1" "github.com/hpcng/warewulf/internal/pkg/node" "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/pkg/hostlist" "github.com/pkg/errors" diff --git a/internal/pkg/warewulfconf/buildconfig.go.in b/internal/pkg/config/buildconfig.go.in similarity index 97% rename from internal/pkg/warewulfconf/buildconfig.go.in rename to internal/pkg/config/buildconfig.go.in index cd7ac2f4..eae1071f 100644 --- a/internal/pkg/warewulfconf/buildconfig.go.in +++ b/internal/pkg/config/buildconfig.go.in @@ -1,4 +1,4 @@ -package warewulfconf +package config type BuildConfig struct { Bindir string `default:"@BINDIR@"` diff --git a/internal/pkg/warewulfconf/constructors.go b/internal/pkg/config/constructors.go similarity index 99% rename from internal/pkg/warewulfconf/constructors.go rename to internal/pkg/config/constructors.go index 2a1e0ff0..6c1192e0 100644 --- a/internal/pkg/warewulfconf/constructors.go +++ b/internal/pkg/config/constructors.go @@ -1,4 +1,4 @@ -package warewulfconf +package config import ( "fmt" diff --git a/internal/pkg/warewulfconf/datastructure.go b/internal/pkg/config/datastructure.go similarity index 99% rename from internal/pkg/warewulfconf/datastructure.go rename to internal/pkg/config/datastructure.go index 1958a2b5..1e92866e 100644 --- a/internal/pkg/warewulfconf/datastructure.go +++ b/internal/pkg/config/datastructure.go @@ -1,4 +1,4 @@ -package warewulfconf +package config import ( "github.com/creasty/defaults" diff --git a/internal/pkg/warewulfconf/modifiers.go b/internal/pkg/config/modifiers.go similarity index 96% rename from internal/pkg/warewulfconf/modifiers.go rename to internal/pkg/config/modifiers.go index 457ed7f0..0c4209f7 100644 --- a/internal/pkg/warewulfconf/modifiers.go +++ b/internal/pkg/config/modifiers.go @@ -1,4 +1,4 @@ -package warewulfconf +package config import ( "os" diff --git a/internal/pkg/configure/dhcp.go b/internal/pkg/configure/dhcp.go index 4d2f42df..c5b1c207 100644 --- a/internal/pkg/configure/dhcp.go +++ b/internal/pkg/configure/dhcp.go @@ -6,7 +6,7 @@ import ( "github.com/hpcng/warewulf/internal/pkg/overlay" "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/pkg/errors" ) diff --git a/internal/pkg/configure/nfs.go b/internal/pkg/configure/nfs.go index d7e18469..14f13e36 100644 --- a/internal/pkg/configure/nfs.go +++ b/internal/pkg/configure/nfs.go @@ -5,7 +5,7 @@ import ( "github.com/hpcng/warewulf/internal/pkg/overlay" "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/pkg/errors" ) diff --git a/internal/pkg/configure/ssh.go b/internal/pkg/configure/ssh.go index 10186bc2..48d3818a 100644 --- a/internal/pkg/configure/ssh.go +++ b/internal/pkg/configure/ssh.go @@ -6,7 +6,7 @@ import ( "path" "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/pkg/errors" ) diff --git a/internal/pkg/configure/tftp.go b/internal/pkg/configure/tftp.go index 74bed889..4988ddfc 100644 --- a/internal/pkg/configure/tftp.go +++ b/internal/pkg/configure/tftp.go @@ -6,7 +6,7 @@ import ( "path" "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" ) diff --git a/internal/pkg/container/config.go b/internal/pkg/container/config.go index ecd751fa..f0babc66 100644 --- a/internal/pkg/container/config.go +++ b/internal/pkg/container/config.go @@ -3,7 +3,7 @@ package container import ( "path" - "github.com/hpcng/warewulf/internal/pkg/warewulfconf" + warewulfconf "github.com/hpcng/warewulf/internal/pkg/config" ) func SourceParentDir() string { diff --git a/internal/pkg/container/imprt.go b/internal/pkg/container/imprt.go index 7a050f49..620991e7 100644 --- a/internal/pkg/container/imprt.go +++ b/internal/pkg/container/imprt.go @@ -9,7 +9,7 @@ import ( "github.com/containers/storage/drivers/copy" "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/util" ) diff --git a/internal/pkg/container/mountpoints.go b/internal/pkg/container/mountpoints.go index 727ff35c..d7281758 100644 --- a/internal/pkg/container/mountpoints.go +++ b/internal/pkg/container/mountpoints.go @@ -3,7 +3,7 @@ package container import ( "strings" - "github.com/hpcng/warewulf/internal/pkg/warewulfconf" + warewulfconf "github.com/hpcng/warewulf/internal/pkg/config" "github.com/hpcng/warewulf/internal/pkg/wwlog" ) diff --git a/internal/pkg/kernel/kernel.go b/internal/pkg/kernel/kernel.go index 32a1da47..4611eb3a 100644 --- a/internal/pkg/kernel/kernel.go +++ b/internal/pkg/kernel/kernel.go @@ -12,7 +12,7 @@ import ( "github.com/pkg/errors" "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" ) diff --git a/internal/pkg/node/constructors.go b/internal/pkg/node/constructors.go index 0619e912..86c19b49 100644 --- a/internal/pkg/node/constructors.go +++ b/internal/pkg/node/constructors.go @@ -8,7 +8,7 @@ import ( "sort" "strings" - "github.com/hpcng/warewulf/internal/pkg/warewulfconf" + warewulfconf "github.com/hpcng/warewulf/internal/pkg/config" "github.com/hpcng/warewulf/internal/pkg/wwlog" "gopkg.in/yaml.v2" diff --git a/internal/pkg/oci/defaults.go b/internal/pkg/oci/defaults.go index ee6dc0e6..74bfb859 100644 --- a/internal/pkg/oci/defaults.go +++ b/internal/pkg/oci/defaults.go @@ -1,11 +1,13 @@ package oci -import "github.com/hpcng/warewulf/internal/pkg/warewulfconf" -import "path/filepath" +import ( + warewulfconf "github.com/hpcng/warewulf/internal/pkg/config" + "path/filepath" +) var defaultCachePath = filepath.Join(warewulfconf.DataStore(), "/container-cache/oci/") const ( blobPrefix = "blobs" rootfsPrefix = "rootfs" -) \ No newline at end of file +) diff --git a/internal/pkg/overlay/config.go b/internal/pkg/overlay/config.go index 91452e4a..59f268fc 100644 --- a/internal/pkg/overlay/config.go +++ b/internal/pkg/overlay/config.go @@ -5,7 +5,7 @@ import ( "path" "strings" - "github.com/hpcng/warewulf/internal/pkg/warewulfconf" + warewulfconf "github.com/hpcng/warewulf/internal/pkg/config" ) func OverlaySourceTopDir() string { diff --git a/internal/pkg/overlay/datastructure.go b/internal/pkg/overlay/datastructure.go index c7da9a70..2cd50b01 100644 --- a/internal/pkg/overlay/datastructure.go +++ b/internal/pkg/overlay/datastructure.go @@ -7,7 +7,7 @@ import ( "time" "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" ) diff --git a/internal/pkg/overlay/funcmap.go b/internal/pkg/overlay/funcmap.go index ebdb1b1a..793f8d9c 100644 --- a/internal/pkg/overlay/funcmap.go +++ b/internal/pkg/overlay/funcmap.go @@ -8,7 +8,7 @@ import ( "github.com/hpcng/warewulf/internal/pkg/container" "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" ) diff --git a/internal/pkg/version/version.go b/internal/pkg/version/version.go index 6b4771bb..0632e2e6 100644 --- a/internal/pkg/version/version.go +++ b/internal/pkg/version/version.go @@ -4,7 +4,7 @@ import ( "fmt" "github.com/hpcng/warewulf/internal/pkg/api/routes/wwapiv1" - "github.com/hpcng/warewulf/internal/pkg/warewulfconf" + warewulfconf "github.com/hpcng/warewulf/internal/pkg/config" ) /* diff --git a/internal/pkg/warewulfd/daemon.go b/internal/pkg/warewulfd/daemon.go index 34a989b6..5d3610c2 100644 --- a/internal/pkg/warewulfd/daemon.go +++ b/internal/pkg/warewulfd/daemon.go @@ -11,7 +11,7 @@ import ( "github.com/hpcng/warewulf/internal/pkg/util" "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/pkg/errors" ) diff --git a/internal/pkg/warewulfd/provision.go b/internal/pkg/warewulfd/provision.go index c96267cc..230f7eb3 100644 --- a/internal/pkg/warewulfd/provision.go +++ b/internal/pkg/warewulfd/provision.go @@ -10,7 +10,7 @@ import ( "github.com/hpcng/warewulf/internal/pkg/container" "github.com/hpcng/warewulf/internal/pkg/kernel" "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" ) diff --git a/internal/pkg/warewulfd/warewulfd.go b/internal/pkg/warewulfd/warewulfd.go index d69aa210..43c24965 100644 --- a/internal/pkg/warewulfd/warewulfd.go +++ b/internal/pkg/warewulfd/warewulfd.go @@ -7,7 +7,7 @@ import ( "strconv" "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/pkg/errors" )