diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-06-17 15:42:30 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-17 15:42:30 +0200 |
| commit | 38391ed25fdb1cc53b70a75ee4fbe7ea0fa782c3 (patch) | |
| tree | 9f5cc3e43c361d15728580781e9bfd4a5a06372d /pkg/specgen | |
| parent | 4fb0f56063de13af53128be9da81027d988516be (diff) | |
| parent | eb8bfdad3e6e4f3bbb308c2ae8c8b6dbba7d4f1c (diff) | |
| download | podman-38391ed25fdb1cc53b70a75ee4fbe7ea0fa782c3.tar.gz podman-38391ed25fdb1cc53b70a75ee4fbe7ea0fa782c3.tar.bz2 podman-38391ed25fdb1cc53b70a75ee4fbe7ea0fa782c3.zip | |
Merge pull request #6622 from goochjj/podman_fix_init
Fix --init and --init-path
Diffstat (limited to 'pkg/specgen')
| -rw-r--r-- | pkg/specgen/generate/oci.go | 2 | ||||
| -rw-r--r-- | pkg/specgen/generate/storage.go | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/pkg/specgen/generate/oci.go b/pkg/specgen/generate/oci.go index 266abd28d..1c34f622b 100644 --- a/pkg/specgen/generate/oci.go +++ b/pkg/specgen/generate/oci.go @@ -112,7 +112,7 @@ func makeCommand(ctx context.Context, s *specgen.SpecGenerator, img *image.Image if initPath == "" { return nil, errors.Errorf("no path to init binary found but container requested an init") } - finalCommand = append([]string{initPath, "--"}, finalCommand...) + finalCommand = append([]string{"/dev/init", "--"}, finalCommand...) } return finalCommand, nil diff --git a/pkg/specgen/generate/storage.go b/pkg/specgen/generate/storage.go index 241c9adeb..0d78421a6 100644 --- a/pkg/specgen/generate/storage.go +++ b/pkg/specgen/generate/storage.go @@ -314,8 +314,8 @@ func addContainerInitBinary(s *specgen.SpecGenerator, path string) (spec.Mount, if !s.PidNS.IsPrivate() { return mount, fmt.Errorf("cannot add init binary as PID 1 (PID namespace isn't private)") } - if s.Systemd == "true" || s.Systemd == "always" { - return mount, fmt.Errorf("cannot use container-init binary with systemd") + if s.Systemd == "always" { + return mount, fmt.Errorf("cannot use container-init binary with systemd=always") } if _, err := os.Stat(path); os.IsNotExist(err) { return mount, errors.Wrap(err, "container-init binary not found on the host") |