diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2019-03-13 11:06:43 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-03-13 11:06:43 -0700 |
| commit | a65788c8761f7a89be8ec6bd0fb547ec73f957f5 (patch) | |
| tree | a2a0de1a8c90ca9ceee98c744e6a26cdd3f6cd6a /pkg/rootless | |
| parent | 31b09d2f7329dfac6a6ac17bc821ecaf59bd6e6b (diff) | |
| parent | c8ca027938b397d52a3064c5b5b10f6707e5f38c (diff) | |
| download | podman-a65788c8761f7a89be8ec6bd0fb547ec73f957f5.tar.gz podman-a65788c8761f7a89be8ec6bd0fb547ec73f957f5.tar.bz2 podman-a65788c8761f7a89be8ec6bd0fb547ec73f957f5.zip | |
Merge pull request #2622 from baude/protectdarwin
Add gating tasks
Diffstat (limited to 'pkg/rootless')
| -rw-r--r-- | pkg/rootless/rootless_unsupported.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkg/rootless/rootless_unsupported.go b/pkg/rootless/rootless_unsupported.go index 54e70961b..e01d7855c 100644 --- a/pkg/rootless/rootless_unsupported.go +++ b/pkg/rootless/rootless_unsupported.go @@ -41,7 +41,7 @@ func SkipStorageSetup() bool { // JoinNS re-exec podman in a new userNS and join the user namespace of the specified // PID. -func JoinNS(pid uint) (bool, int, error) { +func JoinNS(pid uint, preserveFDs int) (bool, int, error) { return false, -1, errors.New("this function is not supported on this os") } |