chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
random-seed: convert poolsize from bits to bytes
[elogind.git]
/
src
/
main.c
diff --git
a/src/main.c
b/src/main.c
index 94401a5c04a161a2600adea41109b5e3954b4bcd..5c28a6c191c90cbde74df3608fe00b5c1b209452 100644
(file)
--- a/
src/main.c
+++ b/
src/main.c
@@
-52,6
+52,7
@@
#include "build.h"
#include "strv.h"
#include "def.h"
#include "build.h"
#include "strv.h"
#include "def.h"
+#include "virt.h"
static enum {
ACTION_RUN,
static enum {
ACTION_RUN,
@@
-76,7
+77,7
@@
static bool arg_mount_auto = true;
static bool arg_swap_auto = true;
static char **arg_default_controllers = NULL;
static char ***arg_join_controllers = NULL;
static bool arg_swap_auto = true;
static char **arg_default_controllers = NULL;
static char ***arg_join_controllers = NULL;
-static ExecOutput arg_default_std_output = EXEC_OUTPUT_
INHERIT
;
+static ExecOutput arg_default_std_output = EXEC_OUTPUT_
SYSLOG
;
static ExecOutput arg_default_std_error = EXEC_OUTPUT_INHERIT;
static FILE* serialization = NULL;
static ExecOutput arg_default_std_error = EXEC_OUTPUT_INHERIT;
static FILE* serialization = NULL;
@@
-1364,7
+1365,6
@@
int main(int argc, char *argv[]) {
}
m->confirm_spawn = arg_confirm_spawn;
}
m->confirm_spawn = arg_confirm_spawn;
- m->show_status = arg_show_status;
#ifdef HAVE_SYSV_COMPAT
m->sysv_console = arg_sysv_console;
#endif
#ifdef HAVE_SYSV_COMPAT
m->sysv_console = arg_sysv_console;
#endif
@@
-1379,6
+1379,8
@@
int main(int argc, char *argv[]) {
if (arg_default_controllers)
manager_set_default_controllers(m, arg_default_controllers);
if (arg_default_controllers)
manager_set_default_controllers(m, arg_default_controllers);
+ manager_set_show_status(m, arg_show_status);
+
before_startup = now(CLOCK_MONOTONIC);
if ((r = manager_startup(m, serialization, fds)) < 0)
before_startup = now(CLOCK_MONOTONIC);
if ((r = manager_startup(m, serialization, fds)) < 0)