chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
core: fix return value on OOM
[elogind.git]
/
src
/
core
/
shutdown.c
diff --git
a/src/core/shutdown.c
b/src/core/shutdown.c
index 6492b19774e6567c1d9eb57962e9689c55ac1b36..70a461e38c79bc08097dc79ad4882c4b714f3c0c 100644
(file)
--- a/
src/core/shutdown.c
+++ b/
src/core/shutdown.c
@@
-20,21
+20,15
@@
***/
#include <sys/mman.h>
***/
#include <sys/mman.h>
-#include <sys/types.h>
#include <sys/reboot.h>
#include <linux/reboot.h>
#include <sys/reboot.h>
#include <linux/reboot.h>
-#include <sys/wait.h>
#include <sys/stat.h>
#include <sys/mount.h>
#include <sys/stat.h>
#include <sys/mount.h>
-#include <sys/syscall.h>
-#include <fcntl.h>
-#include <dirent.h>
#include <errno.h>
#include <unistd.h>
#include <signal.h>
#include <stdbool.h>
#include <stdlib.h>
#include <errno.h>
#include <unistd.h>
#include <signal.h>
#include <stdbool.h>
#include <stdlib.h>
-#include <string.h>
#include <getopt.h>
#include "missing.h"
#include <getopt.h>
#include "missing.h"
@@
-42,7
+36,6
@@
#include "fileio.h"
#include "umount.h"
#include "util.h"
#include "fileio.h"
#include "umount.h"
#include "util.h"
-#include "mkdir.h"
#include "virt.h"
#include "watchdog.h"
#include "killall.h"
#include "virt.h"
#include "watchdog.h"
#include "killall.h"
@@
-159,6
+152,7
@@
int main(int argc, char *argv[]) {
char *arguments[3];
unsigned retries;
int cmd, r;
char *arguments[3];
unsigned retries;
int cmd, r;
+ static const char* const dirs[] = {SYSTEM_SHUTDOWN_PATH, NULL};
log_parse_environment();
r = parse_argv(argc, argv);
log_parse_environment();
r = parse_argv(argc, argv);
@@
-308,7
+302,7
@@
int main(int argc, char *argv[]) {
arguments[0] = NULL;
arguments[1] = arg_verb;
arguments[2] = NULL;
arguments[0] = NULL;
arguments[1] = arg_verb;
arguments[2] = NULL;
- execute_director
y(SYSTEM_SHUTDOWN_PATH, NULL
, DEFAULT_TIMEOUT_USEC, arguments);
+ execute_director
ies(dirs
, DEFAULT_TIMEOUT_USEC, arguments);
if (!in_container && !in_initrd() &&
access("/run/initramfs/shutdown", X_OK) == 0) {
if (!in_container && !in_initrd() &&
access("/run/initramfs/shutdown", X_OK) == 0) {