diff options
| author | asomers <asomers@FreeBSD.org> | 2017-07-31 22:28:33 +0000 |
|---|---|---|
| committer | asomers <asomers@FreeBSD.org> | 2017-07-31 22:28:33 +0000 |
| commit | ec7cbea21848f8e61dc1b2954267c47153b2ca2a (patch) | |
| tree | 0e19656e014770eb473cba486f35dd3e4b650246 /sbin | |
| parent | 054e15f186105f319d8373002c677ecce2d95883 (diff) | |
| download | FreeBSD-src-ec7cbea21848f8e61dc1b2954267c47153b2ca2a.zip FreeBSD-src-ec7cbea21848f8e61dc1b2954267c47153b2ca2a.tar.gz | |
MFC r320165-r320166
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
Diffstat (limited to 'sbin')
| -rw-r--r-- | sbin/devd/devd.cc | 1 | ||||
| -rw-r--r-- | sbin/devd/tests/Makefile | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/sbin/devd/devd.cc b/sbin/devd/devd.cc index 96ed184..346eae2 100644 --- a/sbin/devd/devd.cc +++ b/sbin/devd/devd.cc @@ -1070,6 +1070,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 |
