Skip to content

fix: Try to lock the crypt device around FS creation #10619

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
Bownairo merged 3 commits into from
Jul 3, 2026
+5 −1
Merged

fix: Try to lock the crypt device around FS creation #10619

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d73dec3
Try to lock the crypt device around FS creation
Bownairo Jul 1, 2026
ae66e9b
Add an explicit settle, and fixup ordering
Bownairo Jul 1, 2026
97708b2
PR comments
Bownairo Jul 3, 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
4 changes: 3 additions & 1 deletion ic-os/components/guestos/init/setup-encryption/setup-var-encryption.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ else
/opt/ic/bin/guest_disk crypt-format var "$VAR_PARTITION"
/opt/ic/bin/guest_disk crypt-open var "$VAR_PARTITION"
echo "Populating /var filesystem in ${VAR_PARTITION} on first boot."
mkfs.ext4 -F /dev/mapper/var_crypt -d /var
udevadm lock --device=/dev/mapper/var_crypt mkfs.ext4 -F /dev/mapper/var_crypt -d /var
Comment thread
Bownairo marked this conversation as resolved.
# Fix root inode (mkfs fails to set correct security context).
echo "ea_set / security.selinux system_u:object_r:var_t:s0\\000" | debugfs -w /dev/mapper/var_crypt

Expand Down Expand Up @@ -80,4 +80,6 @@ else
# and continue operating.
cryptsetup luksClose old_var_crypt || echo "Failed to close old /var crypto partition"
fi

udevadm trigger --settle --action=change /dev/mapper/var_crypt
fi
1 change: 1 addition & 0 deletions ic-os/components/upgrade/systemd-generators/mount-generator
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,6 +134,7 @@ function make_var_cryptsetup() {
echo "Before=blockdev@dev-mapper-var_crypt.target"
echo "Wants=blockdev@dev-mapper-var_crypt.target"
echo "Before=var.mount"
echo "Before=systemd-fsck@dev-mapper-var_crypt.service"
Comment thread
Bownairo marked this conversation as resolved.
Outdated
echo "Conflicts=umount.target"
echo "Before=cryptsetup.target"
echo "Requires=init-config.service"
Expand Down
Loading