Lock the screen before suspend instead of racing logind for it
Closing the lid could suspend the machine with the session still exposed. omarchy-sleep-lock held a delay inhibitor and waited for Quickshell to report the session secure, but a delay inhibitor is a timer rather than a promise: logind suspends once InhibitDelayMaxSec expires, locked or not. The default is five seconds, and closing the lid also reconfigures displays -- exactly when the lock service is waiting for the screen set to settle before it can secure. The race is now off the critical path. switch:on:Lid Switch runs omarchy-system-lid-close, which requests the lock the moment the lid closes, before logind has decided to suspend at all, so the inhibitor window usually finds the session already secure. A docked lid close does not suspend (HandleLidSwitchDocked defaults to ignore) and must not lock either, since that is clamshell mode still in use on the external display, so the handler gates on the same closed-and-undocked pair logind itself keys on. Suspends that never touch the lid -- idle timeout, the system menu, low battery -- still arrive through the inhibitor, so that path gets room to work too. The shipped drop-in raises InhibitDelayMaxSec to 15s, and the helper derives its budget from logind's live InhibitDelayMaxUSec rather than assuming the drop-in landed: a machine that has not reloaded logind yet, or that carries its own override, gets a budget that fits what logind will actually allow. It leaves logind a fifth of its own window and caps at 12s, so a hand-raised window cannot strand a closed laptop awake in a bag. The wait itself had three defects. Its deadline arithmetic read EPOCHREALTIME assuming a period, so under any comma-decimal locale the subtraction parsed as bash's comma operator and silently voided the deadline, leaving only the attempt counter to stop it. The lock request shared the status polls' timeout and exited on first failure, so a shell 300ms slow meant suspending unlocked; it now has its own budget and is simply retried, since asking again is idempotent. And a refusal the shell reports on stdout with a zero exit -- missing-pam -- read as success, burning the whole window on a lock that could never happen. Every call is bounded by what is left of the budget rather than by an estimate of what the step should cost, so the deadline holds on hardware slower than anything the constants were fitted to. Failure is still possible and it used to be silent. It now writes to the journal and raises a critical notification, which lands on the screen the user unlocks into. Incidentally, monitor-recovery-test asserted lid probing against omarchy-hw-clamshell after that logic moved to omarchy-hw-laptop-closed. It aborted the file under set -e, skipping the nine assertions behind it. Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
This commit is contained in:
co-authored by
Claude Opus 5
parent
f9bd0fd9d5
commit
9ddcec272d
@@ -0,0 +1,22 @@
|
||||
echo "Give the pre-suspend lock a window it can actually finish in"
|
||||
|
||||
# logind's five second default expires while Quickshell is still securing the
|
||||
# session on lid close, and it suspends regardless. The shipped drop-in raises
|
||||
# InhibitDelayMaxSec, but logind only reads it on reload.
|
||||
#
|
||||
# Reload rather than restart: restarting systemd-logind tears down the session.
|
||||
sudo systemctl reload systemd-logind >/dev/null 2>&1 || true
|
||||
|
||||
# Check the property logind actually enforces, not the reload's exit status: a
|
||||
# reload that returns success while the drop-in is missing or unparsed leaves
|
||||
# the old five second window in place. omarchy-system-sleep-lock reads this same
|
||||
# property at runtime, so it stays correct either way -- the reboot flag is only
|
||||
# about getting the wider window to take effect.
|
||||
dropin=/etc/systemd/logind.conf.d/20-inhibit-delay.conf
|
||||
expected_s=$(sed -n 's/^InhibitDelayMaxSec=//p' "$dropin" 2>/dev/null)
|
||||
effective_us=$(busctl get-property org.freedesktop.login1 /org/freedesktop/login1 \
|
||||
org.freedesktop.login1.Manager InhibitDelayMaxUSec 2>/dev/null | awk '{print $2}')
|
||||
|
||||
if [[ -z $expected_s || $effective_us != $((expected_s * 1000000)) ]]; then
|
||||
omarchy-state set reboot-required
|
||||
fi
|
||||
Reference in New Issue
Block a user