From 5abe4768189802f48db073aaca2c91d4b6b0d405 Mon Sep 17 00:00:00 2001 From: Eric Curtin Date: Tue, 22 Sep 2026 22:51:08 +0100 Subject: [PATCH] systemd: Order bootc-finalize-staged after /boot mount The unit writes to /boot but only declared RequiresMountsFor=/sysroot. When /boot is a systemd-gpt-auto automount, there is no ordering between our ExecStop at shutdown and boot.mount/boot.automount, so lsblk in composefs-finalize-staged can block forever in autofs_expire_wait; systemd kills it after TimeoutStopSec=5m and the staged deployment is never finalized. Seen intermittently in CI as plan-44-shadow-fixup reboot timeouts. Mirror ostree-finalize-staged.service, which gained /boot here for the same reason (ostreedev/ostree#2544). Generated-by: AI Signed-off-by: Eric Curtin --- systemd/bootc-finalize-staged.service | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/systemd/bootc-finalize-staged.service b/systemd/bootc-finalize-staged.service index 60e3f06833..8739d0b2f2 100644 --- a/systemd/bootc-finalize-staged.service +++ b/systemd/bootc-finalize-staged.service @@ -20,7 +20,7 @@ Description=Composefs Finalize Staged Deployment Documentation=man:bootc(1) DefaultDependencies=no -RequiresMountsFor=/sysroot +RequiresMountsFor=/sysroot /boot After=local-fs.target Before=basic.target final.target # We want to make sure the transaction logs are persisted to disk: