summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCole Mickens <cole.mickens@gmail.com>2022-10-04 20:11:12 -0700
committerCole Mickens <cole.mickens@gmail.com>2022-10-06 15:06:50 -0700
commit3d5d6fc78c0f529d4d8c62fa5e9975877d96ec75 (patch)
tree353b6fdf654b7d93f32ea5970a3d86f997a3adac
parentMerge pull request #194519 from felixsinger/pkgs/redmine/update2 (diff)
downloadnixpkgs-3d5d6fc78c0f529d4d8c62fa5e9975877d96ec75.tar.gz
nixos: luksroot: toString-ify keyFileSize usage
-rw-r--r--nixos/modules/system/boot/luksroot.nix4
1 files changed, 2 insertions, 2 deletions
diff --git a/nixos/modules/system/boot/luksroot.nix b/nixos/modules/system/boot/luksroot.nix
index 38f8b6fd87c2..02b020b61eb6 100644
--- a/nixos/modules/system/boot/luksroot.nix
+++ b/nixos/modules/system/boot/luksroot.nix
@@ -481,8 +481,8 @@ let
++ optional v.allowDiscards "discard"
++ optionals v.bypassWorkqueues [ "no-read-workqueue" "no-write-workqueue" ]
++ optional (v.header != null) "header=${v.header}"
- ++ optional (v.keyFileOffset != null) "keyfile-offset=${v.keyFileOffset}"
- ++ optional (v.keyFileSize != null) "keyfile-size=${v.keyFileSize}"
+ ++ optional (v.keyFileOffset != null) "keyfile-offset=${toString v.keyFileOffset}"
+ ++ optional (v.keyFileSize != null) "keyfile-size=${toString v.keyFileSize}"
;
in "${n} ${v.device} ${if v.keyFile == null then "-" else v.keyFile} ${lib.concatStringsSep "," opts}") luks.devices));