aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKristof Provost <kp@FreeBSD.org>2022-06-17 07:01:05 +0000
committerKristof Provost <kp@FreeBSD.org>2022-06-17 07:10:52 +0000
commit5575d5a5486d6065099fb4c25d27fec01df3dc35 (patch)
tree890553abdea57748d48cc987471ff4310edae4bb
parentfc2e4f15a9047bbf546cd675ed590b88e54362bd (diff)
downloadsrc-5575d5a5486d6065099fb4c25d27fec01df3dc35.tar.gz
src-5575d5a5486d6065099fb4c25d27fec01df3dc35.zip
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")
-rw-r--r--sbin/dhclient/tests/pcp.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/sbin/dhclient/tests/pcp.sh b/sbin/dhclient/tests/pcp.sh
index 88c39f452f7f..4875a10a10ce 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()