Merge pull request #11161 from Luap99/slirp-info

podman info show correct slirp4netns path

libpod/info.go

@@ -141,19 +141,24 @@ func (r *Runtime) hostInfo() (*define.HostInfo, error) {
 	}
 	info.CGroupsVersion = cgroupVersion
 
-	if rootless.IsRootless() {
+	slirp4netnsPath := r.config.Engine.NetworkCmdPath
-		if path, err := exec.LookPath("slirp4netns"); err == nil {
+	if slirp4netnsPath == "" {
-			version, err := programVersion(path)
+		slirp4netnsPath, _ = exec.LookPath("slirp4netns")
+	}
+	if slirp4netnsPath != "" {
+		version, err := programVersion(slirp4netnsPath)
 		if err != nil {
-				logrus.Warnf("Failed to retrieve program version for %s: %v", path, err)
+			logrus.Warnf("Failed to retrieve program version for %s: %v", slirp4netnsPath, err)
 		}
 		program := define.SlirpInfo{
-				Executable: path,
+			Executable: slirp4netnsPath,
-				Package:    packageVersion(path),
+			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")

test/system/005-info.bats

@@ -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