Unverified Commit 0ac05883 authored by github-actions[bot]'s avatar github-actions[bot] Committed by GitHub
Browse files

nixos/pam_mount: fix mounts without options (#234147) 



This commit adds a comma in front of the given options, which makes the
mounts still succeed even if no options are given.

Fixes #233946

(cherry picked from commit 4431a343698206425d541cd633d5241bb1fc006f)

Co-authored-by: default avatarnetali <me@netali.de>
parent 44be25f5

nixos/modules/security/pam_mount.nix

+4 −2
Original line number Diff line number Diff line
@@ -167,9 +167,11 @@ in 
          <!-- create mount point if not present -->

          <mkmountpoint enable="${if cfg.createMountPoints then "1" else "0"}" remove="${if cfg.removeCreatedMountPoints then "true" else "false"}" />

          <!-- specify the binaries to be called -->

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

          <!-- the comma in front of the options is necessary for empty options -->

          <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 -o ${concatStringsSep "," (cfg.cryptMountOptions ++ [ "%(OPTIONS)" ])} %(VOLUME) %(MNTPT)</cryptmount>

          <!-- the comma in front of the options is necessary for empty options -->

          <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>"}