manuth/PortValhalla
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Remove trailing slashes properly

Browse source
This commit is contained in:
Manuel Thalmann 2024-12-07 21:09:18 +01:00
parent 9cfb27902a
commit cd83727d54
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
lib/modules/fileSystems.nix
View file

@ -67,6 +67,7 @@ in
fileSystems = { fileSystems = {
script = script =
let let
inherit (lib.strings) normalizePath removeSuffix;
devices = (builtins.attrValues cfg.diskSetup.devices); devices = (builtins.attrValues cfg.diskSetup.devices);
mountScript = lib.strings.concatLines ( mountScript = lib.strings.concatLines (
(builtins.concatMap (builtins.concatMap
@ -80,7 +81,7 @@ in
[ [
(builtins.concatStringsSep " " (builtins.map (_: "-o ${_}") _.options)) (builtins.concatStringsSep " " (builtins.map (_: "-o ${_}") _.options))
(_.device) (_.device)
(lib.strings.normalizePath "/${cfg.diskSetup.rootDir}/${_.mountPoint}") (removeSuffix "/" (normalizePath "/${cfg.rootDir}/${_.mountPoint}"))
] ]
)) ))
] ]