Unverified Commit 7abd408b authored by Jenny's avatar Jenny Committed by GitHub
Browse files

nixos/pam_mount: fix cryptmount options (#232873) 

There was a bug in the pam_mount module that crypt mount options were
not passed to the mount.crypt command. This is now fixed and
additionally, a cryptMountOptions NixOS option is added to define mount
options that should apply to all crypt mounts.

Fixes #230920
parent df8cabc8

nixos/modules/security/pam_mount.nix

+13 −1
Original line number Diff line number Diff line
@@ -47,6 +47,18 @@ in 
        '';

      };



      cryptMountOptions = mkOption {

        type = types.listOf types.str;

        default = [];

        example = literalExpression ''

          [ "allow_discard" ]

        '';

        description = lib.mdDoc ''

          Global mount options that apply to every crypt volume.

          You can define volume-specific options in the volume definitions.

        '';

      };



      fuseMountOptions = mkOption {

        type = types.listOf types.str;

        default = [];
@@ -157,7 +169,7 @@ in 
          <!-- specify the binaries to be called -->

          <fusemount>${pkgs.fuse}/bin/mount.fuse %(VOLUME) %(MNTPT) -o ${concatStringsSep "," (cfg.fuseMountOptions ++ [ "%(OPTIONS)" ])}</fusemount>

          <fuseumount>${pkgs.fuse}/bin/fusermount -u %(MNTPT)</fuseumount>

          <cryptmount>${pkgs.pam_mount}/bin/mount.crypt %(VOLUME) %(MNTPT)</cryptmount>

          <cryptmount>${pkgs.pam_mount}/bin/mount.crypt -o ${concatStringsSep "," (cfg.cryptMountOptions ++ [ "%(OPTIONS)" ])} %(VOLUME) %(MNTPT)</cryptmount>

          <cryptumount>${pkgs.pam_mount}/bin/umount.crypt %(MNTPT)</cryptumount>

          <pmvarrun>${pkgs.pam_mount}/bin/pmvarrun -u %(USER) -o %(OPERATION)</pmvarrun>

          ${optionalString oflRequired "<ofl>${fake_ofl}/bin/fake_ofl %(SIGNAL) %(MNTPT)</ofl>"}