Merge pull request #13076 from chemineer1/codex/shutdown-lid-inhibit
Prevent lid closure from interrupting shutdown
This commit is contained in:
2 files changed
+145
-34
No files matched your search
+25
-10
@@ -4,14 +4,29 @@
|
|||||||
# omarchy:examples=omarchy shutdown | omarchy system shutdown
|
# omarchy:examples=omarchy shutdown | omarchy system shutdown
|
||||||
# omarchy:aliases=omarchy shutdown
|
# omarchy:aliases=omarchy shutdown
|
||||||
|
|
||||||
# Schedule the shutdown in the user manager so closing the terminal's systemd
|
if [[ ${1:-} == "--inhibited" ]]; then
|
||||||
# scope cannot terminate it before it runs.
|
# Close windows in the background so they cannot delay power-off.
|
||||||
systemd-run --user --collect --quiet --on-active="2s" --timer-property=AccuracySec=100ms systemctl poweroff --no-wall || exit 1
|
(
|
||||||
|
omarchy-osd -i shutdown -m "Shutting down" -d 5000
|
||||||
|
omarchy-state clear re*-required
|
||||||
|
omarchy-hyprland-window-close-all
|
||||||
|
) &
|
||||||
|
|
||||||
omarchy-osd -i shutdown -m "Shutting down" -d 5000
|
sleep 2 # Allow apps like Chrome to shut down correctly
|
||||||
|
systemctl poweroff --no-wall
|
||||||
omarchy-state clear re*-required
|
elif [[ ${1:-} == "--inhibit" ]]; then
|
||||||
|
# Report failures from inside the service, independently of the launching terminal.
|
||||||
# Now close all windows
|
# Block lid handling explicitly: it ignores high-level sleep inhibitors.
|
||||||
omarchy-hyprland-window-close-all
|
systemd-inhibit --what=sleep:idle:handle-lid-switch \
|
||||||
sleep 1 # Allow apps like Chrome to shutdown correctly
|
--who=Omarchy --why="Shutdown in progress" --mode=block \
|
||||||
|
"$0" --inhibited || {
|
||||||
|
status=$?
|
||||||
|
omarchy-notification-send -u critical "Shutdown failed" "Could not complete shutdown. Please try again."
|
||||||
|
exit "$status"
|
||||||
|
}
|
||||||
|
else
|
||||||
|
# Schedule the shutdown in the user manager so closing the terminal's systemd
|
||||||
|
# scope cannot terminate it before it runs.
|
||||||
|
systemd-run --user --collect --quiet --property=Type=exec --property=RuntimeMaxSec=30s \
|
||||||
|
"$OMARCHY_PATH/bin/omarchy-system-shutdown" --inhibit
|
||||||
|
fi
|
||||||
@@ -8,20 +8,69 @@ trap 'rm -rf "$test_tmp"' EXIT
|
|||||||
mock_bin="$test_tmp/bin"
|
mock_bin="$test_tmp/bin"
|
||||||
call_log="$test_tmp/calls.log"
|
call_log="$test_tmp/calls.log"
|
||||||
mkdir -p "$mock_bin"
|
mkdir -p "$mock_bin"
|
||||||
|
export PATH="$mock_bin:$PATH" CALL_LOG="$call_log" OMARCHY_PATH="$ROOT"
|
||||||
|
|
||||||
cat >"$mock_bin/systemd-run" <<'SH'
|
cat >"$mock_bin/systemd-run" <<'SH'
|
||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
|
|
||||||
printf 'systemd-run %s\n' "$*" >>"$CALL_LOG"
|
printf 'systemd-run %s\n' "$*" >>"$CALL_LOG"
|
||||||
[[ ${FAIL_SYSTEMD_RUN:-false} == "true" ]] && exit 1
|
[[ ${FAIL_SYSTEMD_RUN:-false} == "true" ]] && exit 1
|
||||||
exit 0
|
[[ " $* " == *" --on-active="* ]] && exit 0
|
||||||
|
while [[ $1 == --* ]]; do shift; done
|
||||||
|
# Capture the service command so its exit status is tested separately.
|
||||||
|
printf '%q ' "$@" >"$CALL_LOG.worker"
|
||||||
SH
|
SH
|
||||||
|
|
||||||
for command in omarchy-state omarchy-hyprland-window-close-all sleep; do
|
cat >"$mock_bin/systemd-inhibit" <<'SH'
|
||||||
|
#!/bin/bash
|
||||||
|
|
||||||
|
printf 'systemd-inhibit %s\n' "$*" >>"$CALL_LOG"
|
||||||
|
[[ ${FAIL_INHIBIT:-false} == "true" ]] && exit 17
|
||||||
|
while [[ $1 == --* ]]; do shift; done
|
||||||
|
touch "$CALL_LOG.inhibited"
|
||||||
|
trap 'rm -f "$CALL_LOG.inhibited"' EXIT
|
||||||
|
"$@"
|
||||||
|
SH
|
||||||
|
|
||||||
|
for command in omarchy-state omarchy-hyprland-window-close-all omarchy-osd omarchy-notification-send sleep systemctl; do
|
||||||
cat >"$mock_bin/$command" <<'SH'
|
cat >"$mock_bin/$command" <<'SH'
|
||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
|
|
||||||
printf '%s %s\n' "$(basename "$0")" "$*" >>"$CALL_LOG"
|
command=${0##*/}
|
||||||
|
printf '%s %s\n' "$command" "$*" >>"$CALL_LOG"
|
||||||
|
case $command in
|
||||||
|
omarchy-hyprland-window-close-all)
|
||||||
|
if [[ ${BLOCK_WINDOW_CLOSE:-false} == "true" ]]; then
|
||||||
|
for (( attempt = 0; attempt < 200; attempt++ )); do
|
||||||
|
if [[ -f $CALL_LOG.poweroff ]]; then
|
||||||
|
touch "$CALL_LOG.close-finished"
|
||||||
|
exit 0
|
||||||
|
fi
|
||||||
|
/usr/bin/sleep 0.01
|
||||||
|
done
|
||||||
|
touch "$CALL_LOG.close-timeout"
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
;;
|
||||||
|
omarchy-notification-send)
|
||||||
|
[[ ${FAIL_NOTIFICATION:-false} != "true" ]] || exit 42
|
||||||
|
;;
|
||||||
|
sleep)
|
||||||
|
if [[ $1 == "2" ]]; then
|
||||||
|
# Synchronize with background preparation without a fixed test-time sleep.
|
||||||
|
for (( attempt = 0; attempt < 200; attempt++ )); do
|
||||||
|
grep -q '^omarchy-hyprland-window-close-all ' "$CALL_LOG" && break
|
||||||
|
/usr/bin/sleep 0.01
|
||||||
|
done
|
||||||
|
touch "$CALL_LOG.grace"
|
||||||
|
fi
|
||||||
|
;;
|
||||||
|
systemctl)
|
||||||
|
[[ $* == "poweroff --no-wall" && -f $CALL_LOG.inhibited && -f $CALL_LOG.grace ]] || exit 2
|
||||||
|
touch "$CALL_LOG.poweroff"
|
||||||
|
[[ ${FAIL_POWEROFF:-false} != "true" ]]
|
||||||
|
;;
|
||||||
|
esac
|
||||||
SH
|
SH
|
||||||
done
|
done
|
||||||
chmod +x "$mock_bin"/*
|
chmod +x "$mock_bin"/*
|
||||||
@@ -30,34 +79,56 @@ run_power_command() {
|
|||||||
local action="$1"
|
local action="$1"
|
||||||
|
|
||||||
: >"$call_log"
|
: >"$call_log"
|
||||||
PATH="$mock_bin:$PATH" CALL_LOG="$call_log" "$ROOT/bin/omarchy-system-$action"
|
rm -f "$CALL_LOG.grace"
|
||||||
}
|
"$ROOT/bin/omarchy-system-$action"
|
||||||
|
|
||||||
assert_power_calls() {
|
|
||||||
local action="$1"
|
|
||||||
local systemctl_action="$2"
|
|
||||||
local expected_log="$test_tmp/$action-expected.log"
|
|
||||||
|
|
||||||
cat >"$expected_log" <<EOF
|
|
||||||
systemd-run --user --collect --quiet --on-active=2s --timer-property=AccuracySec=100ms systemctl $systemctl_action --no-wall
|
|
||||||
omarchy-state clear re*-required
|
|
||||||
omarchy-hyprland-window-close-all
|
|
||||||
sleep 1
|
|
||||||
EOF
|
|
||||||
|
|
||||||
diff -u "$expected_log" "$call_log" || fail "$action runs after being scheduled outside the terminal scope"
|
|
||||||
pass "$action runs after being scheduled outside the terminal scope"
|
|
||||||
}
|
}
|
||||||
|
|
||||||
run_power_command reboot
|
run_power_command reboot
|
||||||
assert_power_calls reboot reboot
|
printf '%s\n' \
|
||||||
|
'systemd-run --user --collect --quiet --on-active=2s --timer-property=AccuracySec=100ms systemctl reboot --no-wall' \
|
||||||
|
'omarchy-osd -i reboot -m Rebooting -d 5000' \
|
||||||
|
'omarchy-state clear re*-required' \
|
||||||
|
'omarchy-hyprland-window-close-all ' \
|
||||||
|
'sleep 1' >"$test_tmp/reboot-expected.log"
|
||||||
|
diff -u "$test_tmp/reboot-expected.log" "$call_log" || fail "reboot runs after being scheduled outside the terminal scope"
|
||||||
|
pass "reboot runs after being scheduled outside the terminal scope"
|
||||||
|
|
||||||
run_power_command shutdown
|
run_power_command shutdown || fail "shutdown service is scheduled"
|
||||||
assert_power_calls shutdown poweroff
|
grep -q '^systemd-run --user --collect --quiet --property=Type=exec --property=RuntimeMaxSec=30s .* --inhibit$' "$CALL_LOG" || fail "shutdown uses a bounded service outside the launching terminal"
|
||||||
|
bash "$CALL_LOG.worker" || fail "protected shutdown succeeds"
|
||||||
|
grep -q '^systemd-inhibit --what=sleep:idle:handle-lid-switch .* --mode=block .* --inhibited$' "$CALL_LOG" || fail "shutdown blocks sleep and lid handling"
|
||||||
|
inhibit_line=$(grep -n '^systemd-inhibit ' "$CALL_LOG" | cut -d: -f1)
|
||||||
|
osd_line=$(grep -n '^omarchy-osd ' "$CALL_LOG" | cut -d: -f1)
|
||||||
|
(( inhibit_line < osd_line )) || fail "inhibition precedes preparation"
|
||||||
|
grep -q '^omarchy-state clear re\*-required$' "$CALL_LOG" || fail "shutdown clears restart state"
|
||||||
|
grep -q '^omarchy-hyprland-window-close-all ' "$CALL_LOG" || fail "shutdown closes windows"
|
||||||
|
grep -q '^systemctl poweroff --no-wall$' "$CALL_LOG" || fail "poweroff runs after the grace period while inhibited"
|
||||||
|
[[ ! -f $CALL_LOG.inhibited ]] || fail "accepted poweroff releases inhibition"
|
||||||
|
! grep -q '^omarchy-notification-send ' "$CALL_LOG" || fail "successful shutdown sends no failure notification"
|
||||||
|
pass "shutdown stays inhibited through preparation and the poweroff request"
|
||||||
|
|
||||||
|
: >"$call_log"
|
||||||
|
rm -f "$CALL_LOG.grace" "$CALL_LOG.poweroff"
|
||||||
|
# Dev link/unlink can leave the user manager pointing at a removed checkout.
|
||||||
|
OMARCHY_PATH="$test_tmp/removed-checkout" bash "$CALL_LOG.worker" || fail "shutdown uses its own script when the service environment is stale"
|
||||||
|
[[ -f $CALL_LOG.poweroff ]] || fail "shutdown reaches poweroff with a stale service environment"
|
||||||
|
[[ ! -f $CALL_LOG.inhibited ]] || fail "shutdown releases inhibition with a stale service environment"
|
||||||
|
! grep -q '^omarchy-notification-send ' "$CALL_LOG" || fail "stale service environment sends no failure notification"
|
||||||
|
pass "shutdown uses its own script when the service environment is stale"
|
||||||
|
|
||||||
|
: >"$call_log"
|
||||||
|
rm -f "$CALL_LOG.grace" "$CALL_LOG.poweroff"
|
||||||
|
BLOCK_WINDOW_CLOSE=true bash "$CALL_LOG.worker" || fail "shutdown proceeds while window closing is blocked"
|
||||||
|
for (( attempt = 0; attempt < 200; attempt++ )); do
|
||||||
|
[[ -f $CALL_LOG.close-finished || -f $CALL_LOG.close-timeout ]] && break
|
||||||
|
/usr/bin/sleep 0.01
|
||||||
|
done
|
||||||
|
[[ -f $CALL_LOG.close-finished && ! -f $CALL_LOG.close-timeout ]] || fail "poweroff releases the blocked window helper before its timeout"
|
||||||
|
pass "blocked window closing cannot delay poweroff"
|
||||||
|
|
||||||
for action in reboot shutdown; do
|
for action in reboot shutdown; do
|
||||||
: >"$call_log"
|
: >"$call_log"
|
||||||
if PATH="$mock_bin:$PATH" CALL_LOG="$call_log" FAIL_SYSTEMD_RUN=true "$ROOT/bin/omarchy-system-$action"; then
|
if FAIL_SYSTEMD_RUN=true "$ROOT/bin/omarchy-system-$action"; then
|
||||||
fail "$action aborts when scheduling fails"
|
fail "$action aborts when scheduling fails"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
@@ -66,3 +137,28 @@ for action in reboot shutdown; do
|
|||||||
fi
|
fi
|
||||||
pass "$action leaves state and windows alone when scheduling fails"
|
pass "$action leaves state and windows alone when scheduling fails"
|
||||||
done
|
done
|
||||||
|
|
||||||
|
for failure in FAIL_INHIBIT FAIL_POWEROFF; do
|
||||||
|
: >"$call_log"
|
||||||
|
rm -f "$CALL_LOG.grace"
|
||||||
|
env "$failure=true" bash "$CALL_LOG.worker"
|
||||||
|
status=$?
|
||||||
|
expected_status=1
|
||||||
|
[[ $failure == "FAIL_INHIBIT" ]] && expected_status=17
|
||||||
|
if (( status != expected_status )); then
|
||||||
|
fail "$failure propagates to the service"
|
||||||
|
fi
|
||||||
|
grep -q '^omarchy-notification-send -u critical Shutdown failed Could not complete shutdown. Please try again.$' "$CALL_LOG" || fail "$failure notifies the user"
|
||||||
|
[[ ! -f $CALL_LOG.inhibited ]] || fail "$failure releases inhibition"
|
||||||
|
if [[ $failure == "FAIL_INHIBIT" ]]; then
|
||||||
|
(( $(wc -l <"$call_log") == 2 )) || fail "inhibitor failure leaves applications alone"
|
||||||
|
else
|
||||||
|
grep -q '^systemctl poweroff --no-wall$' "$CALL_LOG" || fail "rejection test reaches poweroff"
|
||||||
|
fi
|
||||||
|
pass "$failure notifies the user and leaves no inhibitor behind"
|
||||||
|
done
|
||||||
|
|
||||||
|
: >"$call_log"
|
||||||
|
FAIL_INHIBIT=true FAIL_NOTIFICATION=true bash "$CALL_LOG.worker"
|
||||||
|
[[ $? == 17 ]] || fail "notification failure preserves the shutdown error"
|
||||||
|
pass "notification failure preserves the shutdown error"
|
||||||
Reference in new issue
Block a user