chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rules: simplify mmc RPMB handling
[elogind.git]
/
src
/
core
/
shutdown.c
diff --git
a/src/core/shutdown.c
b/src/core/shutdown.c
index 6492b19774e6567c1d9eb57962e9689c55ac1b36..71f001ac13f7118f326048c4bd5e003336d44818 100644
(file)
--- a/
src/core/shutdown.c
+++ b/
src/core/shutdown.c
@@
-49,6
+49,7
@@
#include "cgroup-util.h"
#include "def.h"
#include "switch-root.h"
#include "cgroup-util.h"
#include "def.h"
#include "switch-root.h"
+#include "strv.h"
#define FINALIZE_ATTEMPTS 50
#define FINALIZE_ATTEMPTS 50
@@
-159,6
+160,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
+310,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) {