1 files changed, 32 insertions, 9 deletions
diff --git a/libpod/define/config.go b/libpod/define/config.go
index 8bd59be75..10e00062a 100644
--- a/libpod/define/config.go
+++ b/libpod/define/config.go
@@ -1,25 +1,22 @@
 package define
 
+import (
+	"bufio"
+	"io"
+)
+
 var (
-	// DefaultInitPath is the default path to the container-init binary
-	DefaultInitPath = "/usr/libexec/podman/catatonit"
 	// DefaultInfraImage to use for infra container
-	DefaultInfraImage = "k8s.gcr.io/pause:3.1"
+	DefaultInfraImage = "k8s.gcr.io/pause:3.2"
 	// DefaultInfraCommand to be run in an infra container
 	DefaultInfraCommand = "/pause"
 	// DefaultSHMLockPath is the default path for SHM locks
 	DefaultSHMLockPath = "/libpod_lock"
 	// DefaultRootlessSHMLockPath is the default path for rootless SHM locks
 	DefaultRootlessSHMLockPath = "/libpod_rootless_lock"
-	// DefaultDetachKeys is the default keys sequence for detaching a
-	// container
-	DefaultDetachKeys = "ctrl-p,ctrl-q"
 )
 
 const (
-	// CtrRemoveTimeout is the default number of seconds to wait after stopping a container
-	// before sending the kill signal
-	CtrRemoveTimeout = 10
 	// DefaultTransport is a prefix that we apply to an image name
 	// to check docker hub first for the image
 	DefaultTransport = "docker://"
@@ -34,3 +31,29 @@ type InfoData struct {
 // VolumeDriverLocal is the "local" volume driver. It is managed by libpod
 // itself.
 const VolumeDriverLocal = "local"
+
+const (
+	OCIManifestDir  = "oci-dir"
+	OCIArchive      = "oci-archive"
+	V2s2ManifestDir = "docker-dir"
+	V2s2Archive     = "docker-archive"
+)
+
+// AttachStreams contains streams that will be attached to the container
+type AttachStreams struct {
+	// OutputStream will be attached to container's STDOUT
+	OutputStream io.WriteCloser
+	// ErrorStream will be attached to container's STDERR
+	ErrorStream io.WriteCloser
+	// InputStream will be attached to container's STDIN
+	InputStream *bufio.Reader
+	// AttachOutput is whether to attach to STDOUT
+	// If false, stdout will not be attached
+	AttachOutput bool
+	// AttachError is whether to attach to STDERR
+	// If false, stdout will not be attached
+	AttachError bool
+	// AttachInput is whether to attach to STDIN
+	// If false, stdout will not be attached
+	AttachInput bool
+}