mirror of
https://github.com/containers/podman
synced 2024-10-20 17:23:30 +00:00
podman info show correct slirp4netns path
The slirp4netns path can be set in the config file or with --network-cmd-path. Podman info should read the version information correctly and not use PATH in this case. Also show the slirp4netns version information to root users. Signed-off-by: Paul Holzinger <pholzing@redhat.com>
This commit is contained in:
parent
04ab2b1661
commit
1adeb2b70f
|
@ -141,19 +141,24 @@ func (r *Runtime) hostInfo() (*define.HostInfo, error) {
|
|||
}
|
||||
info.CGroupsVersion = cgroupVersion
|
||||
|
||||
if rootless.IsRootless() {
|
||||
if path, err := exec.LookPath("slirp4netns"); err == nil {
|
||||
version, err := programVersion(path)
|
||||
if err != nil {
|
||||
logrus.Warnf("Failed to retrieve program version for %s: %v", path, err)
|
||||
}
|
||||
program := define.SlirpInfo{
|
||||
Executable: path,
|
||||
Package: packageVersion(path),
|
||||
Version: version,
|
||||
}
|
||||
info.Slirp4NetNS = program
|
||||
slirp4netnsPath := r.config.Engine.NetworkCmdPath
|
||||
if slirp4netnsPath == "" {
|
||||
slirp4netnsPath, _ = exec.LookPath("slirp4netns")
|
||||
}
|
||||
if slirp4netnsPath != "" {
|
||||
version, err := programVersion(slirp4netnsPath)
|
||||
if err != nil {
|
||||
logrus.Warnf("Failed to retrieve program version for %s: %v", slirp4netnsPath, err)
|
||||
}
|
||||
program := define.SlirpInfo{
|
||||
Executable: slirp4netnsPath,
|
||||
Package: packageVersion(slirp4netnsPath),
|
||||
Version: version,
|
||||
}
|
||||
info.Slirp4NetNS = program
|
||||
}
|
||||
|
||||
if rootless.IsRootless() {
|
||||
uidmappings, err := rootless.ReadMappingsProc("/proc/self/uid_map")
|
||||
if err != nil {
|
||||
return nil, errors.Wrapf(err, "error reading uid mappings")
|
||||
|
|
|
@ -47,6 +47,7 @@ store.configFile | $expr_path
|
|||
store.graphDriverName | [a-z0-9]\\\+\\\$
|
||||
store.graphRoot | $expr_path
|
||||
store.imageStore.number | 1
|
||||
host.slirp4netns.executable | $expr_path
|
||||
"
|
||||
|
||||
parse_table "$tests" | while read field expect; do
|
||||
|
|
Loading…
Reference in a new issue