diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2019-01-04 06:41:07 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-01-04 06:41:07 -0800 |
| commit | 6868b5aa1444404113bc6a4582203fbbf89490c2 (patch) | |
| tree | 2be4469136fd0f7c179352d6a721d2e9f0a61f47 /libpod | |
| parent | 9ffd4806163e410d51d0f0cbece45b7405ff9fee (diff) | |
| parent | 75578aad61c1e9fae021223ece70cb83e3e2bcf2 (diff) | |
| download | podman-6868b5aa1444404113bc6a4582203fbbf89490c2.tar.gz podman-6868b5aa1444404113bc6a4582203fbbf89490c2.tar.bz2 podman-6868b5aa1444404113bc6a4582203fbbf89490c2.zip | |
Merge pull request #2045 from vrothberg/init
add init support
Diffstat (limited to 'libpod')
| -rw-r--r-- | libpod/runtime.go | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/libpod/runtime.go b/libpod/runtime.go index 2dfebf565..facbe5d66 100644 --- a/libpod/runtime.go +++ b/libpod/runtime.go @@ -61,6 +61,9 @@ const ( DefaultInfraImage = "k8s.gcr.io/pause:3.1" // DefaultInfraCommand to be run in an infra container DefaultInfraCommand = "/pause" + + // DefaultInitPath is the default path to the container-init binary + DefaultInitPath = "/usr/libexec/podman/catatonit" ) // A RuntimeOption is a functional option which alters the Runtime created by @@ -122,6 +125,8 @@ type RuntimeConfig struct { // CGroupManager is the CGroup Manager to use // Valid values are "cgroupfs" and "systemd" CgroupManager string `toml:"cgroup_manager"` + // InitPath is the path to the container-init binary. + InitPath string `toml:"init_path"` // StaticDir is the path to a persistent directory to store container // files StaticDir string `toml:"static_dir"` @@ -217,6 +222,7 @@ var ( ConmonEnvVars: []string{ "PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin", }, + InitPath: DefaultInitPath, CgroupManager: SystemdCgroupsManager, StaticDir: filepath.Join(storage.DefaultStoreOptions.GraphRoot, "libpod"), TmpDir: "", |