Skip to content

fix: deflake //rs/tests/consensus/upgrade:upgrade_downgrade_nns_subnet_test #9972

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

Closed
basvandijk wants to merge 2 commits into from
+11 −1
Closed

fix: deflake //rs/tests/consensus/upgrade:upgrade_downgrade_nns_subnet_test #9972

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ee7d05d
fix: drop BindsTo from systemd-cryptsetup@var_crypt.service to deflak…
basvandijk Apr 22, 2026
b6bea9a
Merge branch 'master' into ai/deflake-upgrade_downgrade_nns_subnet_te…
basvandijk 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
12 changes: 11 additions & 1 deletion 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 @@ -139,7 +139,17 @@ function make_var_cryptsetup() {
echo "After=init-config.service"
# We need /boot/config for the decryption key (unless SEV is enabled)
echo "RequiresMountsFor=/boot/config"
echo "BindsTo=${SYSTEMD_DEVICE}"
# NOTE: Intentionally Requires= instead of BindsTo= on ${SYSTEMD_DEVICE}.
# BindsTo= (used by stock systemd-cryptsetup units) propagates "stop" from
# the device: a transient udev removal/reappearance of the underlying
# encrypted partition enqueues a stop of this service and, through
# Conflicts=umount.target, cascades into stopping var.mount right after it
# was just mounted, producing a spurious "Failed unmounting var.mount - /var."
# during boot. Requires= preserves "pull the device into the transaction and
# wait for it" without the stop-propagation. The
# systemd-fsck@dev-mapper-var_crypt.service override dropped BindsTo= on the
# same device for the same reason (see commit 97956612d1).
echo "Requires=${SYSTEMD_DEVICE}"
echo "After=${SYSTEMD_DEVICE}"
echo "Before=umount.target"
echo ""
Expand Down
Loading