Date: Thu, 6 Feb 2020 08:32:30 +0000 (UTC) From: Ryan Libby <rlibby@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r357611 - head/libexec/rc/rc.d Message-ID: <202002060832.0168WUp8042094@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: rlibby Date: Thu Feb 6 08:32:30 2020 New Revision: 357611 URL: https://svnweb.freebsd.org/changeset/base/357611 Log: auditd_stop: wait_for_pids instead of sleeping It's faster and more reliable to wait_for_pids than to sleep 1. cem@ suggested just to remove auditd_stop() and use the rc.subr default stop action (SIGTERM instead of audit -t), which has a built-in wait_for_pids. That may be a better solution. Discussed with: cem Reviewed by: asomers Sponsored by: Dell EMC Isilon Differential Revision: https://reviews.freebsd.org/D23223 Modified: head/libexec/rc/rc.d/auditd Modified: head/libexec/rc/rc.d/auditd ============================================================================== --- head/libexec/rc/rc.d/auditd Thu Feb 6 08:32:25 2020 (r357610) +++ head/libexec/rc/rc.d/auditd Thu Feb 6 08:32:30 2020 (r357611) @@ -26,7 +26,9 @@ auditd_stop() { /usr/sbin/audit -t - sleep 1 + if [ -n "$rc_pid" ]; then + wait_for_pids $rc_pid + fi } load_rc_config $name
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202002060832.0168WUp8042094>