diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-07-14 21:09:00 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-14 21:09:00 +0200 |
| commit | c078e936bf5793433359c43498a89943ded3f8fc (patch) | |
| tree | b3a52f531068591a996140e9f7c15b65b49ebbad /pkg/specgen/generate/oci.go | |
| parent | a9a751feefb03834bfe6122583e8db598c4159e1 (diff) | |
| parent | 05988fc74fc25f2ad2256d6e011dfb7ad0b9a4eb (diff) | |
| download | podman-c078e936bf5793433359c43498a89943ded3f8fc.tar.gz podman-c078e936bf5793433359c43498a89943ded3f8fc.tar.bz2 podman-c078e936bf5793433359c43498a89943ded3f8fc.zip | |
Merge pull request #6951 from mheon/check_full_command
When determining systemd mode, use full command
Diffstat (limited to 'pkg/specgen/generate/oci.go')
| -rw-r--r-- | pkg/specgen/generate/oci.go | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/pkg/specgen/generate/oci.go b/pkg/specgen/generate/oci.go index 0a485e7cd..d7818c062 100644 --- a/pkg/specgen/generate/oci.go +++ b/pkg/specgen/generate/oci.go @@ -126,7 +126,7 @@ func makeCommand(ctx context.Context, s *specgen.SpecGenerator, img *image.Image return finalCommand, nil } -func SpecGenToOCI(ctx context.Context, s *specgen.SpecGenerator, rt *libpod.Runtime, rtc *config.Config, newImage *image.Image, mounts []spec.Mount, pod *libpod.Pod) (*spec.Spec, error) { +func SpecGenToOCI(ctx context.Context, s *specgen.SpecGenerator, rt *libpod.Runtime, rtc *config.Config, newImage *image.Image, mounts []spec.Mount, pod *libpod.Pod, finalCmd []string) (*spec.Spec, error) { var ( inUserNS bool ) @@ -252,10 +252,6 @@ func SpecGenToOCI(ctx context.Context, s *specgen.SpecGenerator, rt *libpod.Runt } g.SetProcessCwd(s.WorkDir) - finalCmd, err := makeCommand(ctx, s, newImage, rtc) - if err != nil { - return nil, err - } g.SetProcessArgs(finalCmd) g.SetProcessTerminal(s.Terminal) |