diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-11-12 16:13:16 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-12 16:13:16 +0100 |
| commit | 7774f63319be64a0a96fb7ec7c9f0b7c28faac03 (patch) | |
| tree | 47c2ef7795fed535e81c9ca569645a7fadcaa629 /vendor | |
| parent | 39e3ec767ae045a5413d1cacb76359cc2e7c44ee (diff) | |
| parent | b1b6b88f3baa9155040309c7983565630df96dd8 (diff) | |
| download | podman-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')
| -rw-r--r-- | vendor/github.com/rootless-containers/rootlesskit/pkg/port/builtin/parent/parent.go | 2 | ||||
| -rw-r--r-- | vendor/modules.txt | 2 |
2 files changed, 2 insertions, 2 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. diff --git a/vendor/modules.txt b/vendor/modules.txt index 91e9ee224..6264a8d51 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -478,7 +478,7 @@ github.com/prometheus/common/model # github.com/prometheus/procfs v0.0.3 github.com/prometheus/procfs github.com/prometheus/procfs/internal/fs -# github.com/rootless-containers/rootlesskit v0.11.0 +# github.com/rootless-containers/rootlesskit v0.11.1 github.com/rootless-containers/rootlesskit/pkg/msgutil github.com/rootless-containers/rootlesskit/pkg/port github.com/rootless-containers/rootlesskit/pkg/port/builtin |