Skip to content

fix: Fix remaining race on the var crypt device #9984

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
shilingwang merged 2 commits into from
Apr 27, 2026
Merged

fix: Fix remaining race on the var crypt device #9984

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bdbc813
Do not bind the var mount to the crypt device
Bownairo Apr 22, 2026
536c789
Add explicit Requires to var fsck
Bownairo Apr 22, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion ic-os/components/early-boot/fstab/fstab-guestos
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@ tmpfs /tmp tmpfs defaults 0 2
/dev/disk/by-partuuid/b78084e2-3363-1346-8c25-d426f26b8928 /boot/efi vfat defaults 0 2
/dev/disk/by-partuuid/6788e4cf-f456-104e-9a34-a2c58cfb0ee6 /boot/grub vfat defaults 0 2
/dev/disk/by-partuuid/a5ba3816-beaa-d74d-993e-cfa5aa6ba1f6 /boot/config ext4 defaults,sync 0 2
/dev/mapper/var_crypt /var ext4 defaults 0 2
# Remove the BindsTo on the underlying crypt device. We suspect the device flapping in udev can lead to the mount locking up.
/dev/mapper/var_crypt /var ext4 defaults,x-systemd.device-bound=false 0 2
# If you add a new mount that depends on /dev/mapper/store, don't forget to add it to maybe-disable-store-mounts.service
/dev/mapper/store-shared--backup /var/lib/ic/backup ext4 defaults,context=system_u:object_r:ic_data_t:s0 0 2
/dev/mapper/store-shared--crypto /var/lib/ic/crypto ext4 defaults 0 2
Expand Down
7 changes: 4 additions & 3 deletions ic-os/components/guestos/init/setup-encryption/systemd-fsck@dev-mapper-var_crypt.service
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
# This unit is overridden to remove the BindsTo on the underlying crypt device.
# Otherwise, it is the same as the systemd generated default. We suspect the
# device flapping in udev can lead to the mount locking up.
# This unit is overridden to replace the BindsTo on the underlying crypt device
# with Requires. Otherwise, it is the same as the systemd generated default. We
# suspect the device flapping in udev can lead to the mount locking up.

[Unit]
Description=File System Check on /dev/mapper/var_crypt
Documentation=man:systemd-fsck@.service(8)
DefaultDependencies=no
Requires=dev-mapper-var_crypt.device
Conflicts=shutdown.target
Wants=systemd-fsckd.socket
After=dev-mapper-var_crypt.device systemd-fsck-root.service local-fs-pre.target systemd-fsckd.socket
Expand Down
Loading