diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2018-11-28 09:16:27 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-11-28 09:16:27 -0800 |
| commit | 22d53e2b546e541646c8aec06fa4eb1f61904300 (patch) | |
| tree | 7f64319d12ca1f6974736b5402840a63eb1784e2 /libpod | |
| parent | 88c23b0632518d5b1449b0cd2afa82f4bd53a287 (diff) | |
| parent | 180d0c6f62af8fb18da2ddb0e929392ae3d389e6 (diff) | |
| download | podman-22d53e2b546e541646c8aec06fa4eb1f61904300.tar.gz podman-22d53e2b546e541646c8aec06fa4eb1f61904300.tar.bz2 podman-22d53e2b546e541646c8aec06fa4eb1f61904300.zip | |
Merge pull request #1798 from giuseppe/fix-notify-socket
systemd: fix NOTIFY_SOCKET with patched runc
Diffstat (limited to 'libpod')
| -rw-r--r-- | libpod/oci.go | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/libpod/oci.go b/libpod/oci.go index a8013aa47..6ca3ef2e6 100644 --- a/libpod/oci.go +++ b/libpod/oci.go @@ -591,6 +591,9 @@ func (r *OCIRuntime) startContainer(ctr *Container) error { return err } env := []string{fmt.Sprintf("XDG_RUNTIME_DIR=%s", runtimeDir)} + if notify, ok := os.LookupEnv("NOTIFY_SOCKET"); ok { + env = append(env, fmt.Sprintf("NOTIFY_SOCKET=%s", notify)) + } if err := utils.ExecCmdWithStdStreams(os.Stdin, os.Stdout, os.Stderr, env, r.path, "start", ctr.ID()); err != nil { return err } |