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

Fix incorrect script output

Browse source
This commit is contained in:
Manuel Thalmann 2024-07-06 23:23:31 +02:00
parent 7f5f87ff8e
commit 5169db7448
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lib/modules/partition/disks.nix
View file

@ -357,8 +357,8 @@
in lib.strings.concatLines ( in lib.strings.concatLines (
(builtins.map (_: _.deviceScript) disks) ++ lib.optional ((builtins.length disks) > 0) ( (builtins.map (_: _.deviceScript) disks) ++ lib.optional ((builtins.length disks) > 0) (
''echo "Continuing this script will wipe the contents of '' + ( ''echo "Continuing this script will wipe the contents of '' + (
lib.strings.concatStringsSep ", " (builtins.map (_: "${_.deviceVariable}") disks) lib.strings.concatStringsSep ", " (builtins.map (_: "${_.deviceVariable}") (lib.lists.init disks))
) + (if (builtins.length disks) > 1 then " and " else "") + (lib.lists.last disks).deviceVariable) ++ ) + (if (builtins.length disks) > 1 then " and " else "") + (lib.lists.last disks).deviceVariable + ''"'') ++
(builtins.map (_: _.script) disks) ++ [ (builtins.map (_: _.script) disks) ++ [
mountScript mountScript
swapScript swapScript