Commit 2d44164
Add pre-shutdown phase to coordinate shutdown with Supervisor
Introduce haos-pre-shutdown.target, a phase Supervisor enters before a
API-triggered reboot or power off. ha-cli@.service conflicts with the
target, so the console CLI is stopped by a regular stop job instead of
restart-looping once Supervisor stops the CLI plugin (#4584).
While the CLI is down, haos-shutdown-notice@.service takes over its tty
and shows a shutdown notice, so the console no longer shows just a
blinking cursor. It is a template enabled through ha-cli@.service's
Also=, keeping the console instance defined in a single place.
hassos-supervisor.service gets a longer "docker stop" timeout. As the
unit is already ordered after docker.service, Supervisor can now stop
Home Assistant Core, add-ons and plugins gracefully on SIGTERM before
Docker tears the containers down (#4642).
Supervisor will the target and perform the graceful shutdown via a
separate change.
Closes #4584, closes #4642
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>1 parent 820768d commit 2d44164
6 files changed
Lines changed: 64 additions & 3 deletions
File tree
- buildroot-external/rootfs-overlay/usr
- libexec
- lib/systemd/system
- ha-cli@.service.d
Lines changed: 2 additions & 2 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
2 | 2 | | |
3 | 3 | | |
4 | 4 | | |
5 | | - | |
| 5 | + | |
6 | 6 | | |
7 | 7 | | |
8 | 8 | | |
9 | 9 | | |
10 | | - | |
| 10 | + | |
11 | 11 | | |
12 | 12 | | |
13 | 13 | | |
| |||
Lines changed: 3 additions & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1 | 1 | | |
2 | 2 | | |
| 3 | + | |
| 4 | + | |
| 5 | + | |
Lines changed: 7 additions & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| 2 | + | |
| 3 | + | |
| 4 | + | |
| 5 | + | |
| 6 | + | |
| 7 | + | |
Lines changed: 20 additions & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| 2 | + | |
| 3 | + | |
| 4 | + | |
| 5 | + | |
| 6 | + | |
| 7 | + | |
| 8 | + | |
| 9 | + | |
| 10 | + | |
| 11 | + | |
| 12 | + | |
| 13 | + | |
| 14 | + | |
| 15 | + | |
| 16 | + | |
| 17 | + | |
| 18 | + | |
| 19 | + | |
| 20 | + | |
Lines changed: 6 additions & 1 deletion
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
15 | 15 | | |
16 | 16 | | |
17 | 17 | | |
18 | | - | |
| 18 | + | |
| 19 | + | |
| 20 | + | |
| 21 | + | |
| 22 | + | |
| 23 | + | |
19 | 24 | | |
20 | 25 | | |
21 | 26 | | |
Lines changed: 26 additions & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| 2 | + | |
| 3 | + | |
| 4 | + | |
| 5 | + | |
| 6 | + | |
| 7 | + | |
| 8 | + | |
| 9 | + | |
| 10 | + | |
| 11 | + | |
| 12 | + | |
| 13 | + | |
| 14 | + | |
| 15 | + | |
| 16 | + | |
| 17 | + | |
| 18 | + | |
| 19 | + | |
| 20 | + | |
| 21 | + | |
| 22 | + | |
| 23 | + | |
| 24 | + | |
| 25 | + | |
| 26 | + | |
0 commit comments