diff options
| author | dim <dim@FreeBSD.org> | 2015-07-04 21:50:39 +0000 |
|---|---|---|
| committer | dim <dim@FreeBSD.org> | 2015-07-04 21:50:39 +0000 |
| commit | 6f44bd3256388beb23fd03fdf43ad5d53cf43e29 (patch) | |
| tree | 37590f5c697f4198fdddec33c58aefdef0a5f485 /sbin/casperd/casperd.c | |
| parent | cea4c167517a0678c7dbf92a0324088dcbac1035 (diff) | |
| parent | 76b8ff88e56f9ad0639b7e23dd9d1128a0750026 (diff) | |
| download | FreeBSD-src-6f44bd3256388beb23fd03fdf43ad5d53cf43e29.zip FreeBSD-src-6f44bd3256388beb23fd03fdf43ad5d53cf43e29.tar.gz | |
Merge ^/head r284737 through r285152.
Diffstat (limited to 'sbin/casperd/casperd.c')
| -rw-r--r-- | sbin/casperd/casperd.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sbin/casperd/casperd.c b/sbin/casperd/casperd.c index f838811..e9a4a94 100644 --- a/sbin/casperd/casperd.c +++ b/sbin/casperd/casperd.c @@ -36,6 +36,7 @@ __FBSDID("$FreeBSD$"); #include <sys/socket.h> #include <sys/stat.h> #include <sys/un.h> +#include <sys/nv.h> #include <assert.h> #include <dirent.h> @@ -56,7 +57,6 @@ __FBSDID("$FreeBSD$"); #include <libcasper.h> #include <libcasper_impl.h> #include <msgio.h> -#include <nv.h> #include <pjdlog.h> #include "msgio.h" @@ -253,7 +253,7 @@ casper_command(const char *cmd, const nvlist_t *limits, nvlist_t *nvlin, return (error); } - if (zygote_clone(service_external_execute, 0, &chanfd, &procfd) == -1) { + if (zygote_clone(service_external_execute, &chanfd, &procfd) == -1) { error = errno; close(execfd); return (error); |
