diff options
author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2022-01-05 17:50:37 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-01-05 17:50:37 +0100 |
commit | cbb2b68fc9630ef8cadd19674ab591b7fee9c7d0 (patch) | |
tree | 67523c28abe72177ca0138655e897eddacb656e0 /pkg/rootless | |
parent | 6902d9d9093e1d977ba733a182969bea3489dfbe (diff) | |
parent | f6d00ea6ef977bbaf167d1187d1e4e43632f6b5c (diff) | |
download | podman-cbb2b68fc9630ef8cadd19674ab591b7fee9c7d0.tar.gz podman-cbb2b68fc9630ef8cadd19674ab591b7fee9c7d0.tar.bz2 podman-cbb2b68fc9630ef8cadd19674ab591b7fee9c7d0.zip |
Merge pull request #12429 from cdoern/scp
podman image scp never enter podman user NS
Diffstat (limited to 'pkg/rootless')
-rw-r--r-- | pkg/rootless/rootless_linux.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkg/rootless/rootless_linux.c b/pkg/rootless/rootless_linux.c index 92f331ce4..94bd40f86 100644 --- a/pkg/rootless/rootless_linux.c +++ b/pkg/rootless/rootless_linux.c @@ -244,7 +244,7 @@ can_use_shortcut () if (argv[argc+1] != NULL && (strcmp (argv[argc], "container") == 0 || strcmp (argv[argc], "image") == 0) && - strcmp (argv[argc+1], "mount") == 0) + (strcmp (argv[argc+1], "mount") == 0 || strcmp (argv[argc+1], "scp") == 0)) { ret = false; break; |