diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2022-05-23 10:17:59 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-05-23 10:17:59 -0400 |
| commit | 7d00b0ea0d0c53ddba8d6aebdbce2f167aceccc5 (patch) | |
| tree | 2c37b0bf4e687954b8d8f82dcf8e3021ec6fdedc /pkg/specgen | |
| parent | be255287c929999ff018d0b8319e644b4ea77064 (diff) | |
| parent | 633d5f1f8b8844d6e2fb3e2593768360c889ed76 (diff) | |
| download | podman-7d00b0ea0d0c53ddba8d6aebdbce2f167aceccc5.tar.gz podman-7d00b0ea0d0c53ddba8d6aebdbce2f167aceccc5.tar.bz2 podman-7d00b0ea0d0c53ddba8d6aebdbce2f167aceccc5.zip | |
Merge pull request #14281 from vrothberg/fix-14251
fix --init with /dev bind mount
Diffstat (limited to 'pkg/specgen')
| -rw-r--r-- | pkg/specgen/generate/oci.go | 2 | ||||
| -rw-r--r-- | pkg/specgen/generate/storage.go | 6 |
2 files changed, 3 insertions, 5 deletions
diff --git a/pkg/specgen/generate/oci.go b/pkg/specgen/generate/oci.go index 081df0441..dda2de6e4 100644 --- a/pkg/specgen/generate/oci.go +++ b/pkg/specgen/generate/oci.go @@ -128,7 +128,7 @@ func makeCommand(s *specgen.SpecGenerator, imageData *libimage.ImageData, rtc *c if initPath == "" { return nil, errors.Errorf("no path to init binary found but container requested an init") } - finalCommand = append([]string{"/dev/init", "--"}, finalCommand...) + finalCommand = append([]string{define.ContainerInitPath, "--"}, finalCommand...) } return finalCommand, nil diff --git a/pkg/specgen/generate/storage.go b/pkg/specgen/generate/storage.go index f30fc4671..0a4d03780 100644 --- a/pkg/specgen/generate/storage.go +++ b/pkg/specgen/generate/storage.go @@ -20,9 +20,7 @@ import ( "github.com/sirupsen/logrus" ) -var ( - errDuplicateDest = errors.Errorf("duplicate mount destination") -) +var errDuplicateDest = errors.Errorf("duplicate mount destination") // Produce final mounts and named volumes for a container func finalizeMounts(ctx context.Context, s *specgen.SpecGenerator, rt *libpod.Runtime, rtc *config.Config, img *libimage.Image) ([]spec.Mount, []*specgen.NamedVolume, []*specgen.OverlayVolume, error) { @@ -359,7 +357,7 @@ func getVolumesFrom(volumesFrom []string, runtime *libpod.Runtime) (map[string]s // This does *NOT* modify the container command - that must be done elsewhere. func addContainerInitBinary(s *specgen.SpecGenerator, path string) (spec.Mount, error) { mount := spec.Mount{ - Destination: "/dev/init", + Destination: define.ContainerInitPath, Type: define.TypeBind, Source: path, Options: []string{define.TypeBind, "ro"}, |