SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

test: adapt to the new capsh format

Browse Source 
Since libcap v2.29 the format of cap_to_text() has been changed which
makes certain `test-execute` subtest fail. Let's remove the offending
part of the output (dropped capabilities) to make it compatible with
both the old and the new libcap.
This commit is contained in:
Frantisek Sumsal
2020-02-05 10:11:42 +01:00
committed by Zbigniew Jędrzejewski-Szmek
parent f2394ddb08
commit 9569e38503
9 changed files with 18 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test/test-execute/exec-protectkernelmodules-yes-capabilities.service
+2 -1
View File
@@ -3,5 +3,6 @@ Description=Test CAP_SYS_MODULE for ProtectKernelModules=yes
[Service]
ProtectKernelModules=yes
ExecStart=/bin/sh -x -c '! capsh --print | grep cap_sys_module'
# sed: remove dropped capabilities (cap_xxx-[epi]) from the output
ExecStart=/bin/sh -x -c '! capsh --print | sed -r "s/[^ ]+?\-[epi]+//g" | grep cap_sys_module'
Type=oneshot