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 v232: Apply missing updates from upstream
[elogind.git]
/
src
/
login
/
logind.c
diff --git
a/src/login/logind.c
b/src/login/logind.c
index 77a11bbfe276c9d6e07756e3931a0a83e978f3b2..2efa78c19ff638c31f4be7d9798d9617524ca027 100644
(file)
--- a/
src/login/logind.c
+++ b/
src/login/logind.c
@@
-42,7
+42,6
@@
#include "signal-util.h"
#include "strv.h"
#include "udev-util.h"
#include "signal-util.h"
#include "strv.h"
#include "udev-util.h"
-
/// Additional includes needed by elogind
#include "cgroup.h" // From src/core/
#include "elogind.h"
/// Additional includes needed by elogind
#include "cgroup.h" // From src/core/
#include "elogind.h"
@@
-74,7
+73,7
@@
static void manager_reset_config(Manager *m) {
m->idle_action = HANDLE_IGNORE;
m->runtime_dir_size = physical_memory_scale(10U, 100U); /* 10% */
m->idle_action = HANDLE_IGNORE;
m->runtime_dir_size = physical_memory_scale(10U, 100U); /* 10% */
- m->user_tasks_max = system_tasks_max_scale(
33U
, 100U); /* 33% */
+ m->user_tasks_max = system_tasks_max_scale(
DEFAULT_USER_TASKS_MAX_PERCENTAGE
, 100U); /* 33% */
m->sessions_max = 8192;
m->inhibitors_max = 8192;
m->sessions_max = 8192;
m->inhibitors_max = 8192;
@@
-1047,7
+1046,7
@@
static int manager_parse_config_file(Manager *m) {
#if 0 /// elogind parses its own config file
assert(m);
#if 0 /// elogind parses its own config file
assert(m);
- return config_parse_many(PKGSYSCONFDIR "/logind.conf",
+ return config_parse_many
_nulstr
(PKGSYSCONFDIR "/logind.conf",
CONF_PATHS_NULSTR("systemd/logind.conf.d"),
"Login\0",
config_item_perf_lookup, logind_gperf_lookup,
CONF_PATHS_NULSTR("systemd/logind.conf.d"),
"Login\0",
config_item_perf_lookup, logind_gperf_lookup,
@@
-1209,12
+1208,15
@@
int main(int argc, char *argv[]) {
log_set_target(LOG_TARGET_AUTO);
log_set_facility(LOG_AUTH);
log_parse_environment();
log_set_target(LOG_TARGET_AUTO);
log_set_facility(LOG_AUTH);
log_parse_environment();
- log_open();
#ifdef ENABLE_DEBUG_ELOGIND
log_set_max_level(LOG_DEBUG);
#ifdef ENABLE_DEBUG_ELOGIND
log_set_max_level(LOG_DEBUG);
+ log_set_target(LOG_TARGET_SYSLOG_OR_KMSG);
#endif // ENABLE_DEBUG_ELOGIND
#endif // ENABLE_DEBUG_ELOGIND
+ log_open();
+
+
umask(0022);
if (argc != 1) {
umask(0022);
if (argc != 1) {