nspawn: fix getent fallback

[elogind.git] / src / login / logind-action.c

diff --git a/src/login/logind-action.c b/src/login/logind-action.c
index da5a8305fa9af4f1ec248e0fadaa4e086c09a2c5..ae7b35055a86b48013870b1a6057655ad7c1cfc2 100644 (file)
--- a/src/login/logind-action.c
+++ b/src/login/logind-action.c
@@ -70,18 +70,31 @@ int manager_handle_action(
                 return 0;
         }
 
-        /* If we are docked don't react to lid closing */
         if (inhibit_key == INHIBIT_HANDLE_LID_SWITCH) {
                 int n;
 
+                /* If we are docked don't react to lid closing */
                 if (manager_is_docked(m)) {
                         log_debug("Ignoring lid switch request, system is docked.");
                         return 0;
                 }
 
+                /* If we have more than one or no displays connected,
+                 * don't react to lid closing. The no display case we
+                 * treat like this under the assumption that there is
+                 * no modern drm driver available. */
                 n = manager_count_displays(m);
                 if (n != 1) {
-                        log_debug("Ignoring lid switch request, %s displays connected.");
+                        log_debug("Ignoring lid switch request, %i displays connected.", n);
+                        return 0;
+                }
+
+                /* If the last system suspend or startup is too close,
+                 * let's not suspend for now, to give USB docking
+                 * stations some time to settle so that we can
+                 * properly watch its displays. */
+                if (m->lid_switch_ignore_event_source) {
+                        log_debug("Ignoring lid switch request, system startup or resume too close.");
                         return 0;
                 }
         }