gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

bcachefs-unlock: Also handle mount paths

Browse Source 
Co-authored-by: Will Fancher <elvishjerricco@gmail.com>
This commit is contained in:
Charlotte
2025-06-25 09:37:33 +01:00
committed by GitHub
parent ca0c35d813
commit 814bbef95e
1 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
nixos/modules/tasks/filesystems/bcachefs.nix
View File

@@ -97,7 +97,15 @@ let
deviceUnit = mkDeviceUnit device; deviceUnit = mkDeviceUnit device;
extractProperty = extractProperty =
prop: options: (map (lib.removePrefix "${prop}=") (builtins.filter (lib.hasPrefix prop) options)); prop: options: (map (lib.removePrefix "${prop}=") (builtins.filter (lib.hasPrefix prop) options));
normalizeUnits = unit: if lib.hasPrefix "/" unit then mkDeviceUnit unit else unit; mkMountUnit = path: "${utils.escapeSystemdPath path}.mount";
normalizeUnits =
unit:
if lib.hasPrefix "/dev/" unit then
mkDeviceUnit unit
else if lib.hasPrefix "/" unit then
mkMountUnit unit
else
unit;
requiredUnits = map normalizeUnits (extractProperty "x-systemd.requires" fs.options); requiredUnits = map normalizeUnits (extractProperty "x-systemd.requires" fs.options);
wantedUnits = map normalizeUnits (extractProperty "x-systemd.wants" fs.options); wantedUnits = map normalizeUnits (extractProperty "x-systemd.wants" fs.options);
in in