diff --git a/.gitignore b/.gitignore index 336240fcb5..a8942b24d9 100644 --- a/.gitignore +++ b/.gitignore @@ -16,6 +16,7 @@ /data/kata-collect-data.sh /kata-netmon /kata-runtime +/pkg/katautils/config-settings.go /virtcontainers/hack/virtc/virtc /virtcontainers/hook/mock/hook /virtcontainers/profile.cov diff --git a/Makefile b/Makefile index 33da90a9b0..377ed94dc5 100644 --- a/Makefile +++ b/Makefile @@ -537,6 +537,7 @@ endef GENERATED_FILES += $(CLI_DIR)/config-generated.go +GENERATED_FILES += pkg/katautils/config-settings.go $(TARGET_OUTPUT): $(SOURCES) $(GENERATED_FILES) $(MAKEFILE_LIST) | show-summary $(QUIET_BUILD)(cd $(CLI_DIR) && go build $(KATA_LDFLAGS) $(BUILDFLAGS) -o $@ .) diff --git a/pkg/katautils/config-settings.go b/pkg/katautils/config-settings.go.in similarity index 93% rename from pkg/katautils/config-settings.go rename to pkg/katautils/config-settings.go.in index 37464b93da..aaf78cc3f9 100644 --- a/pkg/katautils/config-settings.go +++ b/pkg/katautils/config-settings.go.in @@ -55,11 +55,11 @@ const defaultTemplatePath string = "/run/vc/vm/template" const defaultVMCacheEndpoint string = "/var/run/kata-containers/cache.sock" // Default config file used by stateless systems. -var defaultRuntimeConfiguration = "/usr/share/defaults/kata-containers/configuration.toml" +var defaultRuntimeConfiguration = "@CONFIG_PATH@" // Alternate config file that takes precedence over // defaultRuntimeConfiguration. -var defaultSysConfRuntimeConfiguration = "/etc/kata-containers/configuration.toml" +var defaultSysConfRuntimeConfiguration = "@SYSCONFIG@" var name = "kata" var defaultProxyPath = "/usr/libexec/kata-containers/kata-proxy"