test: skip testsuite-50.mountnfsd if kernel/polkit are too old

Need full support of pidfd to work, so skip the test if it's not
available

diff --git a/test/TEST-50-DISSECT/test.sh b/test/TEST-50-DISSECT/test.sh
index b93697b73c75af417d912e46bcae80a2dc27fd5c..a0cd677f075c3745fd27f17642c9d5bdfc8ba84a 100755 (executable)
--- a/test/TEST-50-DISSECT/test.sh
+++ b/test/TEST-50-DISSECT/test.sh
@@ -36,6 +36,7 @@ test_append_files() {
     fi
     inst_binary mksquashfs
     inst_binary unsquashfs
+    inst_binary pkcheck
     install_verity_minimal
 }
 

diff --git a/test/units/testsuite-50.mountnfsd.sh b/test/units/testsuite-50.mountnfsd.sh
index fea6b7d50b7acd5e98d3301762eba86596a28f92..59974e41e6265979d37f31cd21e3bc79b97e19dd 100755 (executable)
--- a/test/units/testsuite-50.mountnfsd.sh
+++ b/test/units/testsuite-50.mountnfsd.sh
@@ -10,7 +10,9 @@ if [[ ! -f /usr/lib/systemd/system/systemd-mountfsd.socket ]] || \
    [[ ! -f /usr/lib/systemd/system/systemd-nsresourced.socket ]] || \
    ! command -v mksquashfs || \
    ! grep -q bpf /sys/kernel/security/lsm ||
-   ! find /usr/lib* -name libbpf.so.1 2>/dev/null | grep .; then
+   ! find /usr/lib* -name libbpf.so.1 2>/dev/null | grep . || \
+   systemd-analyze compare-versions "$(uname -r)" lt 6.5 || \
+   systemd-analyze compare-versions "$(pkcheck --version | awk '{print $3}')" lt 124; then
     echo "Skipping mountnfsd/nsresourced tests"
     exit 0
 fi