chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fsckd: the error code is actually returned in 'fd'
[elogind.git]
/
src
/
login
/
logind.c
diff --git
a/src/login/logind.c
b/src/login/logind.c
index 08a7cbc08a2afe7f18a0985aff7fde31fe96f187..e7880743a0657566c5ceea18cbb56c31ee627ff3 100644
(file)
--- a/
src/login/logind.c
+++ b/
src/login/logind.c
@@
-54,6
+54,7
@@
Manager *manager_new(void) {
m->handle_lid_switch = HANDLE_SUSPEND;
m->handle_lid_switch_docked = HANDLE_IGNORE;
m->lid_switch_ignore_inhibited = true;
m->handle_lid_switch = HANDLE_SUSPEND;
m->handle_lid_switch_docked = HANDLE_IGNORE;
m->lid_switch_ignore_inhibited = true;
+ m->holdoff_timeout_usec = 30 * USEC_PER_SEC;
m->idle_action_usec = 30 * USEC_PER_MINUTE;
m->idle_action = HANDLE_IGNORE;
m->idle_action_usec = 30 * USEC_PER_MINUTE;
m->idle_action = HANDLE_IGNORE;
@@
-1029,7
+1030,7
@@
int manager_startup(Manager *m) {
if (r < 0)
return log_error_errno(r, "Failed to add seat0: %m");
if (r < 0)
return log_error_errno(r, "Failed to add seat0: %m");
- r = manager_set_lid_switch_ignore(m, 0 +
IGNORE_LID_SWITCH_STARTUP_USEC
);
+ r = manager_set_lid_switch_ignore(m, 0 +
m->holdoff_timeout_usec
);
if (r < 0)
log_warning_errno(r, "Failed to set up lid switch ignore event source: %m");
if (r < 0)
log_warning_errno(r, "Failed to set up lid switch ignore event source: %m");