Skip to content

fix: unlock once per bcachefs filesystem #1265

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

Open
amaanq wants to merge 1 commit into
base: master
Choose a base branch
from
+11 −10
Open

fix: unlock once per bcachefs filesystem #1265

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
21 changes: 11 additions & 10 deletions lib/types/bcachefs_filesystem.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -230,11 +230,6 @@
# @todo Figure out why the "X-mount.mkdir" option here doesn't seem to work,
# necessitating running `mkdir` here.
mkdir -p "${rootMountPoint}${subvolume.mountpoint}";
${lib.optionalString (config.passwordFile != null) ''
if ! bcachefs unlock -k session "/dev/disk/by-uuid/${config.uuid}" < "${config.passwordFile}"; then
test -d "/sys/fs/bcachefs/${config.uuid}";
fi;
''}
mount \
-t bcachefs \
-o "${
Expand All @@ -256,6 +251,17 @@
) (lib.attrValues config.subvolumes);
in
{
dev = lib.optionalString (config.passwordFile != null) ''
# Unlock once per filesystem, before any of its mountpoints are
# processed. Doing this inside each per-mountpoint fragment causes
# EBUSY on the second mount because the first mount holds the
# device exclusively.
if ! findmnt "UUID=${config.uuid}" >/dev/null 2>&1; then
if ! bcachefs unlock -k session "/dev/disk/by-uuid/${config.uuid}" < "${config.passwordFile}"; then
test -d "/sys/fs/bcachefs/${config.uuid}";
fi;
fi;
'';
fs =
subvolumeMounts
// lib.optionalAttrs (config.mountpoint != null) {
Expand All @@ -264,11 +270,6 @@
# @todo Figure out why the "X-mount.mkdir" option here doesn't seem to work,
# necessitating running `mkdir` here.
mkdir -p "${rootMountPoint}${config.mountpoint}";
${lib.optionalString (config.passwordFile != null) ''
if ! bcachefs unlock -k session "/dev/disk/by-uuid/${config.uuid}" < "${config.passwordFile}"; then
test -d "/sys/fs/bcachefs/${config.uuid}";
fi;
''}
mount \
-t bcachefs \
-o "${lib.concatStringsSep "," (lib.unique ([ "X-mount.mkdir" ] ++ config.mountOptions))}" \
Expand Down
Loading