chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
selinux: close stdin/stdout/stderr before loading selinux policy
[elogind.git]
/
src
/
core
/
main.c
diff --git
a/src/core/main.c
b/src/core/main.c
index 7b5c86161fe512525c5e947faf34c936b5c954d1..458fdca55e86f9b465ef8bd6347b95067fdb19ee 100644
(file)
--- a/
src/core/main.c
+++ b/
src/core/main.c
@@
-1266,6
+1266,8
@@
int main(int argc, char *argv[]) {
}
arg_running_as = MANAGER_SYSTEM;
}
arg_running_as = MANAGER_SYSTEM;
+
+ make_null_stdio();
log_set_target(detect_container(NULL) > 0 ? LOG_TARGET_JOURNAL : LOG_TARGET_JOURNAL_OR_KMSG);
if (!skip_setup) {
log_set_target(detect_container(NULL) > 0 ? LOG_TARGET_JOURNAL : LOG_TARGET_JOURNAL_OR_KMSG);
if (!skip_setup) {
@@
-1310,7
+1312,7
@@
int main(int argc, char *argv[]) {
goto finish;
arg_join_controllers[0] = strv_new("cpu", "cpuacct", "cpuset", NULL);
goto finish;
arg_join_controllers[0] = strv_new("cpu", "cpuacct", "cpuset", NULL);
- arg_join_controllers[1] = strv_new("net_cls", "netprio", NULL);
+ arg_join_controllers[1] = strv_new("net_cls", "net
_
prio", NULL);
arg_join_controllers[2] = NULL;
if (!arg_join_controllers[0])
arg_join_controllers[2] = NULL;
if (!arg_join_controllers[0])
@@
-1439,10
+1441,8
@@
int main(int argc, char *argv[]) {
/* Reset the console, but only if this is really init and we
* are freshly booted */
/* Reset the console, but only if this is really init and we
* are freshly booted */
- if (arg_running_as == MANAGER_SYSTEM && arg_action == ACTION_RUN)
{
+ if (arg_running_as == MANAGER_SYSTEM && arg_action == ACTION_RUN)
console_setup(getpid() == 1 && !skip_setup);
console_setup(getpid() == 1 && !skip_setup);
- make_null_stdio();
- }
/* Open the logging devices, if possible and necessary */
log_open();
/* Open the logging devices, if possible and necessary */
log_open();