diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-04-21 15:56:53 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-21 15:56:53 -0400 |
| commit | 413929babd078f3d1281994398501997c1a2d4d1 (patch) | |
| tree | 81833e3654a63e042f7d77b854740003fa0d8b4a /pkg/specgen/generate/oci.go | |
| parent | 2ed4a0e35f6182b79976979ecf3f3ab9010417bd (diff) | |
| parent | 1cd2b746d0d6a4e8c074bc444b4a4a2afef30d5d (diff) | |
| download | podman-413929babd078f3d1281994398501997c1a2d4d1.tar.gz podman-413929babd078f3d1281994398501997c1a2d4d1.tar.bz2 podman-413929babd078f3d1281994398501997c1a2d4d1.zip | |
Merge pull request #5905 from mheon/redo_namespaces
Modify namespace generation code for specgen
Diffstat (limited to 'pkg/specgen/generate/oci.go')
| -rw-r--r-- | pkg/specgen/generate/oci.go | 23 |
1 files changed, 1 insertions, 22 deletions
diff --git a/pkg/specgen/generate/oci.go b/pkg/specgen/generate/oci.go index fc269cd44..8ca95016e 100644 --- a/pkg/specgen/generate/oci.go +++ b/pkg/specgen/generate/oci.go @@ -217,28 +217,7 @@ func SpecGenToOCI(s *specgen.SpecGenerator, rt *libpod.Runtime, newImage *image. } // NAMESPACES - - if err := pidConfigureGenerator(s, &g); err != nil { - return nil, err - } - - if err := userConfigureGenerator(s, &g); err != nil { - return nil, err - } - - if err := networkConfigureGenerator(s, &g); err != nil { - return nil, err - } - - if err := utsConfigureGenerator(s, &g, rt); err != nil { - return nil, err - } - - if err := ipcConfigureGenerator(s, &g); err != nil { - return nil, err - } - - if err := cgroupConfigureGenerator(s, &g); err != nil { + if err := specConfigureNamespaces(s, &g, rt); err != nil { return nil, err } configSpec := g.Config |