diff options
| author | asomers <asomers@FreeBSD.org> | 2017-07-06 17:34:53 +0000 |
|---|---|---|
| committer | asomers <asomers@FreeBSD.org> | 2017-07-06 17:34:53 +0000 |
| commit | fa37f1c820abf8a84d3bbbce8abac35e331d45dd (patch) | |
| tree | ad7427ced2b700956b5f222414314ee91473910f | |
| parent | 38e040b8a74b276abd3c9818289ff2c4839e050a (diff) | |
| download | FreeBSD-src-fa37f1c820abf8a84d3bbbce8abac35e331d45dd.zip FreeBSD-src-fa37f1c820abf8a84d3bbbce8abac35e331d45dd.tar.gz | |
MFC r320165-r320167
r320165:
devd(8): Remove pidfile on shutdown
Sponsored by: Spectra Logic Corp
r320166:
Require devd to be running for its ATF tests to run
The ATF tests communicate with the system's running devd
PR: 220169
Reported by: gjb
Sponsored by: Spectra Logic Corp
r320167:
zfsd(8): Remove pidfile on shutdown
Sponsored by: Spectra Logic Corp
| -rw-r--r-- | cddl/usr.sbin/zfsd/zfsd.cc | 2 | ||||
| -rw-r--r-- | sbin/devd/devd.cc | 1 | ||||
| -rw-r--r-- | sbin/devd/tests/Makefile | 3 |
3 files changed, 4 insertions, 2 deletions
diff --git a/cddl/usr.sbin/zfsd/zfsd.cc b/cddl/usr.sbin/zfsd/zfsd.cc index e05c16d..648455f 100644 --- a/cddl/usr.sbin/zfsd/zfsd.cc +++ b/cddl/usr.sbin/zfsd/zfsd.cc @@ -437,7 +437,7 @@ void ZfsDaemon::ClosePIDFile() { if (s_pidFH != NULL) - pidfile_close(s_pidFH); + pidfile_remove(s_pidFH); } void diff --git a/sbin/devd/devd.cc b/sbin/devd/devd.cc index d8738e2..083035d 100644 --- a/sbin/devd/devd.cc +++ b/sbin/devd/devd.cc @@ -1085,6 +1085,7 @@ event_loop(void) if (FD_ISSET(seqpacket_fd, &fds)) new_client(seqpacket_fd, SOCK_SEQPACKET); } + cfg.remove_pidfile(); close(seqpacket_fd); close(stream_fd); close(fd); diff --git a/sbin/devd/tests/Makefile b/sbin/devd/tests/Makefile index e06928c..c0a346f 100644 --- a/sbin/devd/tests/Makefile +++ b/sbin/devd/tests/Makefile @@ -1,7 +1,8 @@ # $FreeBSD$ ATF_TESTS_C= client_test -TEST_METADATA.client_test= required_programs="devd" +TEST_METADATA.client_test= required_files="/var/run/devd.pid" +TEST_METADATA.client_test+= required_programs="devd" TEST_METADATA.client_test+= required_user="root" TEST_METADATA.client_test+= timeout=15 |
