chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
timedated: use libsystemd-bus instead of libdbus for bus communication
[elogind.git]
/
src
/
nspawn
/
nspawn.c
diff --git
a/src/nspawn/nspawn.c
b/src/nspawn/nspawn.c
index fc4a8a36c869b716a4ffff7b38cb46fcc5bb7d39..ad0287dbf40ee6dc4c6dcf1f052635613ba45663 100644
(file)
--- a/
src/nspawn/nspawn.c
+++ b/
src/nspawn/nspawn.c
@@
-61,8
+61,7
@@
#include "fdset.h"
#include "build.h"
#include "fileio.h"
#include "fdset.h"
#include "build.h"
#include "fileio.h"
-#include "bus-internal.h"
-#include "bus-message.h"
+#include "bus-util.h"
#ifndef TTY_GID
#define TTY_GID 5
#ifndef TTY_GID
#define TTY_GID 5
@@
-1187,7
+1186,7
@@
static int register_machine(void) {
NULL,
"sayssusa(sv)",
arg_machine,
NULL,
"sayssusa(sv)",
arg_machine,
- SD_BUS_APPEND_ID128(arg_uuid),
+ SD_BUS_
MESSAGE_
APPEND_ID128(arg_uuid),
"nspawn",
"container",
(uint32_t) 0,
"nspawn",
"container",
(uint32_t) 0,
@@
-1223,7
+1222,7
@@
int main(int argc, char *argv[]) {
bool saved_attr_valid = false;
struct winsize ws;
int kmsg_socket_pair[2] = { -1, -1 };
bool saved_attr_valid = false;
struct winsize ws;
int kmsg_socket_pair[2] = { -1, -1 };
- FDSet *fds = NULL;
+
_cleanup_fdset_free_
FDSet *fds = NULL;
log_parse_environment();
log_open();
log_parse_environment();
log_open();
@@
-1725,7
+1724,5
@@
finish:
free(arg_directory);
free(arg_machine);
free(arg_directory);
free(arg_machine);
- fdset_free(fds);
-
return r;
}
return r;
}