github/kata-containers
1
0
Fork 1
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-08-10 04:18:26 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #2617 from fidencio/wip/shimv2_config_paths

Browse Source 
katautils: Use config paths set during the build
This commit is contained in:
Fupan Li 2020-04-16 16:40:04 +08:00 committed by GitHub
commit 39a039cde5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -16,6 +16,7 @@
/data/kata-collect-data.sh /data/kata-collect-data.sh
/kata-netmon /kata-netmon
/kata-runtime /kata-runtime
/pkg/katautils/config-settings.go
/virtcontainers/hack/virtc/virtc /virtcontainers/hack/virtc/virtc
/virtcontainers/hook/mock/hook /virtcontainers/hook/mock/hook
/virtcontainers/profile.cov /virtcontainers/profile.cov

1
Makefile
View File

@ -537,6 +537,7 @@ endef
GENERATED_FILES += $(CLI_DIR)/config-generated.go GENERATED_FILES += $(CLI_DIR)/config-generated.go
GENERATED_FILES += pkg/katautils/config-settings.go
$(TARGET_OUTPUT): $(SOURCES) $(GENERATED_FILES) $(MAKEFILE_LIST) | show-summary $(TARGET_OUTPUT): $(SOURCES) $(GENERATED_FILES) $(MAKEFILE_LIST) | show-summary
$(QUIET_BUILD)(cd $(CLI_DIR) && go build $(KATA_LDFLAGS) $(BUILDFLAGS) -o $@ .) $(QUIET_BUILD)(cd $(CLI_DIR) && go build $(KATA_LDFLAGS) $(BUILDFLAGS) -o $@ .)

4
pkg/katautils/config-settings.go → pkg/katautils/config-settings.go.in
View File

@ -55,11 +55,11 @@ const defaultTemplatePath string = "/run/vc/vm/template"
const defaultVMCacheEndpoint string = "/var/run/kata-containers/cache.sock" const defaultVMCacheEndpoint string = "/var/run/kata-containers/cache.sock"
// Default config file used by stateless systems. // 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 // Alternate config file that takes precedence over
// defaultRuntimeConfiguration. // defaultRuntimeConfiguration.
var defaultSysConfRuntimeConfiguration = "/etc/kata-containers/configuration.toml" var defaultSysConfRuntimeConfiguration = "@SYSCONFIG@"
var name = "kata" var name = "kata"
var defaultProxyPath = "/usr/libexec/kata-containers/kata-proxy" var defaultProxyPath = "/usr/libexec/kata-containers/kata-proxy"