diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2021-03-07 14:13:51 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-03-07 14:13:51 -0500 |
| commit | 4174b06a4b45b94cdd35a1f4b4d142266cd9cb78 (patch) | |
| tree | 061f599c0a2475d52fc7521097f1d73ba1caa621 /pkg/specgen/generate/config_linux.go | |
| parent | a9fcd9d7602ce59a704884c6840e27666fea20d1 (diff) | |
| parent | 1a33b764893cec16d9648ee008d7c41cc9482106 (diff) | |
| download | podman-4174b06a4b45b94cdd35a1f4b4d142266cd9cb78.tar.gz podman-4174b06a4b45b94cdd35a1f4b4d142266cd9cb78.tar.bz2 podman-4174b06a4b45b94cdd35a1f4b4d142266cd9cb78.zip | |
Merge pull request #9648 from jmguzik/unify-mount-consts
[NO TESTS NEEDED] Cleanup/unify mount consts
Diffstat (limited to 'pkg/specgen/generate/config_linux.go')
| -rw-r--r-- | pkg/specgen/generate/config_linux.go | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/pkg/specgen/generate/config_linux.go b/pkg/specgen/generate/config_linux.go index 2792d0cb7..5c945cff3 100644 --- a/pkg/specgen/generate/config_linux.go +++ b/pkg/specgen/generate/config_linux.go @@ -8,6 +8,7 @@ import ( "path/filepath" "strings" + "github.com/containers/podman/v3/libpod/define" "github.com/containers/podman/v3/pkg/rootless" "github.com/containers/podman/v3/pkg/util" spec "github.com/opencontainers/runtime-spec/specs-go" @@ -37,7 +38,7 @@ func addPrivilegedDevices(g *generate.Generator) error { for _, d := range hostDevices { devMnt := spec.Mount{ Destination: d.Path, - Type: TypeBind, + Type: define.TypeBind, Source: d.Path, Options: []string{"slave", "nosuid", "noexec", "rw", "rbind"}, } @@ -259,7 +260,7 @@ func addDevice(g *generate.Generator, device string) error { } devMnt := spec.Mount{ Destination: dst, - Type: TypeBind, + Type: define.TypeBind, Source: src, Options: []string{"slave", "nosuid", "noexec", perm, "rbind"}, } |