summaryrefslogtreecommitdiff
path: root/vendor/github.com
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2020-11-12 16:13:16 +0100
committerGitHub <noreply@github.com>2020-11-12 16:13:16 +0100
commit7774f63319be64a0a96fb7ec7c9f0b7c28faac03 (patch)
tree47c2ef7795fed535e81c9ca569645a7fadcaa629 /vendor/github.com
parent39e3ec767ae045a5413d1cacb76359cc2e7c44ee (diff)
parentb1b6b88f3baa9155040309c7983565630df96dd8 (diff)
downloadpodman-7774f63319be64a0a96fb7ec7c9f0b7c28faac03.tar.gz
podman-7774f63319be64a0a96fb7ec7c9f0b7c28faac03.tar.bz2
podman-7774f63319be64a0a96fb7ec7c9f0b7c28faac03.zip
Merge pull request #8311 from containers/dependabot/go_modules/github.com/rootless-containers/rootlesskit-0.11.1
Bump github.com/rootless-containers/rootlesskit from 0.11.0 to 0.11.1
Diffstat (limited to 'vendor/github.com')
-rw-r--r--vendor/github.com/rootless-containers/rootlesskit/pkg/port/builtin/parent/parent.go2
1 files changed, 1 insertions, 1 deletions
diff --git a/vendor/github.com/rootless-containers/rootlesskit/pkg/port/builtin/parent/parent.go b/vendor/github.com/rootless-containers/rootlesskit/pkg/port/builtin/parent/parent.go
index 49252a06d..f6e5e56ed 100644
--- a/vendor/github.com/rootless-containers/rootlesskit/pkg/port/builtin/parent/parent.go
+++ b/vendor/github.com/rootless-containers/rootlesskit/pkg/port/builtin/parent/parent.go
@@ -111,7 +111,7 @@ func annotateEPERM(origErr error, spec port.Spec) error {
// origErr is unrelated to ip_unprivileged_port_start
return origErr
}
- text := fmt.Sprintf("cannot expose privileged port %d, you might need to add \"net.ipv4.ip_unprivileged_port_start=0\" (currently %d) to /etc/sysctl.conf", spec.ParentPort, start)
+ text := fmt.Sprintf("cannot expose privileged port %d, you can add 'net.ipv4.ip_unprivileged_port_start=%d' to /etc/sysctl.conf (currently %d)", spec.ParentPort, spec.ParentPort, start)
if filepath.Base(os.Args[0]) == "rootlesskit" {
// NOTE: The following sentence is appended only if Args[0] == "rootlesskit", because it does not apply to Podman (as of Podman v1.9).
// Podman launches the parent driver in the child user namespace (but in the parent network namespace), which disables the file capability.