diff options
author | Vladimír Čunát <v@cunat.cz> | 2023-10-30 06:12:04 +0100 |
---|---|---|
committer | Vladimír Čunát <v@cunat.cz> | 2023-10-30 06:12:04 +0100 |
commit | 5c89ba8ab417f95486e2042558fdce218dadf83b (patch) | |
tree | fae7ead1edd78a395de199814f9fb0417f201759 /nixos/modules/tasks | |
parent | ffd13c1ba38c08c6f004d6d9a3c10d124febc3b4 (diff) | |
parent | 4d32327bb04299bd7596cf98266e926656494b14 (diff) | |
download | nixlib-5c89ba8ab417f95486e2042558fdce218dadf83b.tar nixlib-5c89ba8ab417f95486e2042558fdce218dadf83b.tar.gz nixlib-5c89ba8ab417f95486e2042558fdce218dadf83b.tar.bz2 nixlib-5c89ba8ab417f95486e2042558fdce218dadf83b.tar.lz nixlib-5c89ba8ab417f95486e2042558fdce218dadf83b.tar.xz nixlib-5c89ba8ab417f95486e2042558fdce218dadf83b.tar.zst nixlib-5c89ba8ab417f95486e2042558fdce218dadf83b.zip |
Merge branch 'master' into staging-next
Diffstat (limited to 'nixos/modules/tasks')
-rw-r--r-- | nixos/modules/tasks/filesystems/bcachefs.nix | 50 |
1 files changed, 40 insertions, 10 deletions
diff --git a/nixos/modules/tasks/filesystems/bcachefs.nix b/nixos/modules/tasks/filesystems/bcachefs.nix index ed56983bb899..40305a2e66aa 100644 --- a/nixos/modules/tasks/filesystems/bcachefs.nix +++ b/nixos/modules/tasks/filesystems/bcachefs.nix @@ -52,17 +52,43 @@ let } ''; - openCommand = name: fs: - let - # we need only unlock one device manually, and cannot pass multiple at once - # remove this adaptation when bcachefs implements mounting by filesystem uuid - # also, implement automatic waiting for the constituent devices when that happens - # bcachefs does not support mounting devices with colons in the path, ergo we don't (see #49671) - firstDevice = head (splitString ":" fs.device); - in - '' - tryUnlock ${name} ${firstDevice} + # we need only unlock one device manually, and cannot pass multiple at once + # remove this adaptation when bcachefs implements mounting by filesystem uuid + # also, implement automatic waiting for the constituent devices when that happens + # bcachefs does not support mounting devices with colons in the path, ergo we don't (see #49671) + firstDevice = fs: head (splitString ":" fs.device); + + openCommand = name: fs: '' + tryUnlock ${name} ${firstDevice fs} + ''; + + mkUnits = prefix: name: fs: let + mountUnit = "${utils.escapeSystemdPath (prefix + (lib.removeSuffix "/" fs.mountPoint))}.mount"; + device = firstDevice fs; + deviceUnit = "${utils.escapeSystemdPath device}.device"; + in { + name = "unlock-bcachefs-${utils.escapeSystemdPath fs.mountPoint}"; + value = { + description = "Unlock bcachefs for ${fs.mountPoint}"; + requiredBy = [ mountUnit ]; + before = [ mountUnit ]; + bindsTo = [ deviceUnit ]; + after = [ deviceUnit ]; + unitConfig.DefaultDependencies = false; + serviceConfig = { + Type = "oneshot"; + ExecCondition = "${pkgs.bcachefs-tools}/bin/bcachefs unlock -c \"${device}\""; + Restart = "on-failure"; + RestartMode = "direct"; + # Ideally, this service would lock the key on stop. + # As is, RemainAfterExit doesn't accomplish anything. + RemainAfterExit = true; + }; + script = '' + ${config.boot.initrd.systemd.package}/bin/systemd-ask-password --timeout=0 "enter passphrase for ${name}" | exec ${pkgs.bcachefs-tools}/bin/bcachefs unlock "${device}" ''; + }; + }; in @@ -75,6 +101,8 @@ in # use kernel package with bcachefs support until it's in mainline # TODO replace with requireKernelConfig boot.kernelPackages = pkgs.linuxPackages_testing_bcachefs; + + systemd.services = lib.mapAttrs' (mkUnits "") (lib.filterAttrs (n: fs: (fs.fsType == "bcachefs") && (!utils.fsNeededForBoot fs)) config.fileSystems); } (mkIf ((elem "bcachefs" config.boot.initrd.supportedFilesystems) || (bootFs != {})) { @@ -94,6 +122,8 @@ in ''; boot.initrd.postDeviceCommands = commonFunctions + concatStrings (mapAttrsToList openCommand bootFs); + + boot.initrd.systemd.services = lib.mapAttrs' (mkUnits "/sysroot") bootFs; }) ]); } |