Unverified Commit a905c3a5 authored by Ryan Lahfa's avatar Ryan Lahfa Committed by GitHub
Browse files

Merge pull request #262854 from ElvishJerricco/systemd-stage-1-bcachefs-decryption 

systemd-stage-1: bcachefs decryption
parents 707696cc 0425c4de

nixos/modules/tasks/filesystems/bcachefs.nix

+40 −10
Original line number Diff line number Diff line
@@ -34,17 +34,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}

  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
@@ -59,6 +85,8 @@ in 


      # use kernel package with bcachefs support until it's in mainline

      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 != {})) {
@@ -79,6 +107,8 @@ in 
      '';



      boot.initrd.postDeviceCommands = commonFunctions + concatStrings (mapAttrsToList openCommand bootFs);



      boot.initrd.systemd.services = lib.mapAttrs' (mkUnits "/sysroot") bootFs;

    })

  ]);

}

nixos/tests/installer-systemd-stage-1.nix

+2 −0
Original line number Diff line number Diff line
@@ -8,6 +8,8 @@ 
  # them when fixed.

  inherit (import ./installer.nix { inherit system config pkgs; systemdStage1 = true; })

    # bcache

    bcachefsSimple

    bcachefsEncrypted

    btrfsSimple

    btrfsSubvolDefault

    btrfsSubvolEscape

nixos/tests/installer.nix

+4 −0
Original line number Diff line number Diff line
@@ -937,6 +937,10 @@ in { 
    enableOCR = true;

    preBootCommands = ''

      machine.start()

      # Enter it wrong once

      machine.wait_for_text("enter passphrase for ")

      machine.send_chars("wrong\n")

      # Then enter it right.

      machine.wait_for_text("enter passphrase for ")

      machine.send_chars("password\n")

    '';