From d956846767fdce8fdb44e159fdb977ed64f79ca4 Mon Sep 17 00:00:00 2001 From: Doug Rabson Date: Wed, 9 Nov 2022 12:27:19 +0000 Subject: [PATCH] libpod: Add FreeBSD support in packageVersion This reports the correct package versions in 'podman info' for conmon and ociRuntime on FreeBSD which is needed for the 005-info system test. [NO NEW TESTS NEEDED] Signed-off-by: Doug Rabson --- libpod/util.go | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/libpod/util.go b/libpod/util.go index c5a2b81bd2..eb4cfc23b7 100644 --- a/libpod/util.go +++ b/libpod/util.go @@ -171,11 +171,12 @@ func queryPackageVersion(cmdArg ...string) string { func packageVersion(program string) string { // program is full path packagers := [][]string{ {"/usr/bin/rpm", "-q", "-f"}, - {"/usr/bin/dpkg", "-S"}, // Debian, Ubuntu - {"/usr/bin/pacman", "-Qo"}, // Arch - {"/usr/bin/qfile", "-qv"}, // Gentoo (quick) - {"/usr/bin/equery", "b"}, // Gentoo (slow) - {"/sbin/apk", "info", "-W"}, // Alpine + {"/usr/bin/dpkg", "-S"}, // Debian, Ubuntu + {"/usr/bin/pacman", "-Qo"}, // Arch + {"/usr/bin/qfile", "-qv"}, // Gentoo (quick) + {"/usr/bin/equery", "b"}, // Gentoo (slow) + {"/sbin/apk", "info", "-W"}, // Alpine + {"/usr/local/sbin/pkg", "which", "-q"}, // FreeBSD } for _, cmd := range packagers {