From 5575d5a5486d6065099fb4c25d27fec01df3dc35 Mon Sep 17 00:00:00 2001 From: Kristof Provost Date: Fri, 17 Jun 2022 09:01:05 +0200 Subject: [PATCH] dhclient: fix pcp:pcp cleanup failure If isc-dhcp44-server is not installed (as is the case the project's CI servers) we don't create ngctl.shutdown, causing the 'rm' to fail. That in turn causes the cleanup function to return non-zero, which causes kyua to consider the test failed. Use 'rm -f' instead, so we don't error even if the file doesn't exist. Sponsored by: Rubicon Communications, LLC ("Netgate") --- sbin/dhclient/tests/pcp.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sbin/dhclient/tests/pcp.sh b/sbin/dhclient/tests/pcp.sh index 88c39f452f7..4875a10a10c 100644 --- a/sbin/dhclient/tests/pcp.sh +++ b/sbin/dhclient/tests/pcp.sh @@ -185,7 +185,7 @@ pcp_cleanup() for i in $(cat ngctl.shutdown); do ngctl shutdown ${i}: done - rm ngctl.shutdown + rm -f ngctl.shutdown } atf_init_test_cases()