diff options
| author | Lawrence Chan <element103@gmail.com> | 2019-06-07 12:42:04 -0500 |
|---|---|---|
| committer | Lawrence Chan <element103@gmail.com> | 2019-06-14 17:42:05 -0500 |
| commit | 373048aaca279c006672b339b099af6e5a87b60a (patch) | |
| tree | 3c00e6490c111d8ddd7c8da3902895e6cc87d29b | |
| parent | 6ea12e302877f7ce1b77d3dafc4d0aa51839840c (diff) | |
| download | podman-373048aaca279c006672b339b099af6e5a87b60a.tar.gz podman-373048aaca279c006672b339b099af6e5a87b60a.tar.bz2 podman-373048aaca279c006672b339b099af6e5a87b60a.zip | |
Move installPrefix and etcDir into runtime.go
Signed-off-by: Lawrence Chan <element103@gmail.com>
| -rw-r--r-- | libpod/runtime.go | 7 | ||||
| -rw-r--r-- | libpod/version.go | 6 |
2 files changed, 7 insertions, 6 deletions
diff --git a/libpod/runtime.go b/libpod/runtime.go index c2a387083..34a3ea9c8 100644 --- a/libpod/runtime.go +++ b/libpod/runtime.go @@ -45,6 +45,13 @@ const ( ) var ( + // InstallPrefix is the prefix where podman will be installed. + // It can be overridden at build time. + installPrefix string = "/usr/local" + // EtcDir is the sysconfdir where podman should look for system config files. + // It can be overridden at build time. + etcDir string = "/etc" + // SeccompDefaultPath defines the default seccomp path SeccompDefaultPath = installPrefix + "/share/containers/seccomp.json" // SeccompOverridePath if this exists it overrides the default seccomp path diff --git a/libpod/version.go b/libpod/version.go index b876efddd..d2b99a275 100644 --- a/libpod/version.go +++ b/libpod/version.go @@ -15,12 +15,6 @@ var ( // BuildInfo is the time at which the binary was built // It will be populated by the Makefile. buildInfo string - // InstallPrefix is the prefix where podman will be installed. - // It will be populated by the Makefile. - installPrefix string = "/usr/local" - // EtcDir is the sysconfdir where podman should look for system config files. - // It will be populated by the Makefile. - etcDir string = "/etc" ) //Version is an output struct for varlink |