From 728b73d7c4186f4f0f9431d84ec2c5883f38ff20 Mon Sep 17 00:00:00 2001 From: chenkang Date: Sat, 17 Apr 2021 21:15:08 +0800 Subject: set pidfile default value int containerconfig Signed-off-by: chenkang --- libpod/oci_conmon_linux.go | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) (limited to 'libpod/oci_conmon_linux.go') diff --git a/libpod/oci_conmon_linux.go b/libpod/oci_conmon_linux.go index c5735d114..dbe91c232 100644 --- a/libpod/oci_conmon_linux.go +++ b/libpod/oci_conmon_linux.go @@ -1025,12 +1025,7 @@ func (r *ConmonOCIRuntime) createOCIContainer(ctr *Container, restoreOptions *Co } } - pidfile := ctr.config.PidFile - if pidfile == "" { - pidfile = filepath.Join(ctr.state.RunDir, "pidfile") - } - - args := r.sharedConmonArgs(ctr, ctr.ID(), ctr.bundlePath(), pidfile, ctr.LogPath(), r.exitsDir, ociLog, ctr.LogDriver(), logTag) + args := r.sharedConmonArgs(ctr, ctr.ID(), ctr.bundlePath(), ctr.config.PidFile, ctr.LogPath(), r.exitsDir, ociLog, ctr.LogDriver(), logTag) if ctr.config.Spec.Process.Terminal { args = append(args, "-t") -- cgit v1.2.3-54-g00ecf