From f55288c96f8a007a9fb2774c9f26d32f46da982a Mon Sep 17 00:00:00 2001 From: Chris Evich Date: Wed, 24 Jul 2019 11:01:49 -0400 Subject: Cirrus: Simplify evil-unit check in image Signed-off-by: Chris Evich --- contrib/cirrus/check_image.sh | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/contrib/cirrus/check_image.sh b/contrib/cirrus/check_image.sh index 690a38119..2bdd240d9 100755 --- a/contrib/cirrus/check_image.sh +++ b/contrib/cirrus/check_image.sh @@ -36,10 +36,12 @@ do "$(systemctl list-unit-files --no-legend $REQ_UNIT)" = "$REQ_UNIT enabled" || let "RET+=1" done -# Exits zero if any unit matching pattern is running -UNIT_STATUS=$(systemctl is-active $EVIL_UNITS; echo $?) -item_test "No interfering background units are active:" \ - "$UNIT_STATUS" -ne "0" || let "RET+=1" +for evil_unit in $EVIL_UNITS +do + # Exits zero if any unit matching pattern is running + unit_status=$(systemctl is-active $evil_unit &> /dev/null; echo $?) + item_test "No $evil_unit unit is present or active:" "$unit_status" -ne "0" || let "RET+=1" +done echo "Total failed tests: $RET" exit $RET -- cgit v1.2.3-54-g00ecf