chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Prep v225: Added needed udev support and re-enabled some masked cgroup functions.
[elogind.git]
/
src
/
shared
/
machine-pool.c
diff --git
a/src/shared/machine-pool.c
b/src/shared/machine-pool.c
index 447983fb1b2c847be5aad9adbac5563b9246d290..8af78f47d5e3775de87065a6a3cb7e86dbd1ea08 100644
(file)
--- a/
src/shared/machine-pool.c
+++ b/
src/shared/machine-pool.c
@@
-30,6
+30,7
@@
#include "mkdir.h"
#include "btrfs-util.h"
#include "path-util.h"
#include "mkdir.h"
#include "btrfs-util.h"
#include "path-util.h"
+#include "signal-util.h"
#include "machine-pool.h"
#define VAR_LIB_MACHINES_SIZE_START (1024UL*1024UL*500UL)
#include "machine-pool.h"
#define VAR_LIB_MACHINES_SIZE_START (1024UL*1024UL*500UL)
@@
-74,7
+75,7
@@
static int setup_machine_raw(uint64_t size, sd_bus_error *error) {
if (errno != ENOENT)
return sd_bus_error_set_errnof(error, errno, "Failed to open /var/lib/machines.raw: %m");
if (errno != ENOENT)
return sd_bus_error_set_errnof(error, errno, "Failed to open /var/lib/machines.raw: %m");
- r = tempfn_xxxxxx("/var/lib/machines.raw", &tmp);
+ r = tempfn_xxxxxx("/var/lib/machines.raw",
NULL,
&tmp);
if (r < 0)
return r;
if (r < 0)
return r;
@@
-108,8
+109,8
@@
static int setup_machine_raw(uint64_t size, sd_bus_error *error) {
/* Child */
/* Child */
- reset_all_signal_handlers();
- reset_signal_mask();
+
(void)
reset_all_signal_handlers();
+
(void)
reset_signal_mask();
assert_se(prctl(PR_SET_PDEATHSIG, SIGTERM) == 0);
fd = safe_close(fd);
assert_se(prctl(PR_SET_PDEATHSIG, SIGTERM) == 0);
fd = safe_close(fd);