diff options
| author | Matthew Heon <matthew.heon@gmail.com> | 2018-01-10 16:42:49 -0500 |
|---|---|---|
| committer | Atomic Bot <atomic-devel@projectatomic.io> | 2018-01-12 17:01:36 +0000 |
| commit | 9c5a42eb1fcff8b99cc99ce307f51567efec9b61 (patch) | |
| tree | a0b019a71f0b70cd634d91f879a5d30a128f2e6f /libpod/runtime.go | |
| parent | 6e8100cf2e70c8c6b5a8504298d1e295a288a0b1 (diff) | |
| download | podman-9c5a42eb1fcff8b99cc99ce307f51567efec9b61.tar.gz podman-9c5a42eb1fcff8b99cc99ce307f51567efec9b61.tar.bz2 podman-9c5a42eb1fcff8b99cc99ce307f51567efec9b61.zip | |
Remove unused fields from runtime config
Signed-off-by: Matthew Heon <matthew.heon@gmail.com>
Closes: #212
Approved by: rhatdan
Diffstat (limited to 'libpod/runtime.go')
| -rw-r--r-- | libpod/runtime.go | 19 |
1 files changed, 8 insertions, 11 deletions
diff --git a/libpod/runtime.go b/libpod/runtime.go index d0aa481cf..50aa97528 100644 --- a/libpod/runtime.go +++ b/libpod/runtime.go @@ -46,8 +46,6 @@ type RuntimeConfig struct { CgroupManager string StaticDir string TmpDir string - SelinuxEnabled bool - PidsLimit int64 MaxLogSize int64 NoPivotRoot bool CNIConfigDir string @@ -65,15 +63,13 @@ var ( ConmonEnvVars: []string{ "PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin", }, - CgroupManager: "cgroupfs", - StaticDir: filepath.Join(storage.DefaultStoreOptions.GraphRoot, "libpod"), - TmpDir: "/var/run/libpod", - SelinuxEnabled: false, - PidsLimit: 1024, - MaxLogSize: -1, - NoPivotRoot: false, - CNIConfigDir: "/etc/cni/net.d/", - CNIPluginDir: []string{"/usr/libexec/cni", "/opt/cni/bin"}, + CgroupManager: "cgroupfs", + StaticDir: filepath.Join(storage.DefaultStoreOptions.GraphRoot, "libpod"), + TmpDir: "/var/run/libpod", + MaxLogSize: -1, + NoPivotRoot: false, + CNIConfigDir: "/etc/cni/net.d/", + CNIPluginDir: []string{"/usr/libexec/cni", "/opt/cni/bin"}, } ) @@ -323,6 +319,7 @@ func (r *Runtime) refresh(alivePath string) error { } } + // Create a file indicating the runtime is alive and ready file, err := os.OpenFile(alivePath, os.O_RDONLY|os.O_CREATE, 0644) if err != nil { return errors.Wrapf(err, "error creating runtime status file %s", alivePath) |