diff options
| author | Robert Hensing <roberth@users.noreply.github.com> | 2022-10-12 00:00:35 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-10-12 00:00:35 +0100 |
| commit | 129fd1ab276a5ba773026a8c4cd7ca33d98d36c7 (patch) | |
| tree | 17d83a45cdf3df84b85b0defe2c4316d2c860c55 /nixos | |
| parent | 3cb43544f10d1231dd1cdbafee19de6df7820332 (diff) | |
| parent | 3d5d6fc78c0f529d4d8c62fa5e9975877d96ec75 (diff) | |
| download | nixpkgs-129fd1ab276a5ba773026a8c4cd7ca33d98d36c7.tar nixpkgs-129fd1ab276a5ba773026a8c4cd7ca33d98d36c7.tar.gz nixpkgs-129fd1ab276a5ba773026a8c4cd7ca33d98d36c7.tar.bz2 nixpkgs-129fd1ab276a5ba773026a8c4cd7ca33d98d36c7.tar.lz nixpkgs-129fd1ab276a5ba773026a8c4cd7ca33d98d36c7.tar.xz nixpkgs-129fd1ab276a5ba773026a8c4cd7ca33d98d36c7.tar.zst nixpkgs-129fd1ab276a5ba773026a8c4cd7ca33d98d36c7.zip | |
Merge pull request #194530 from colemickens/stage-1-systemd-luksroot-toString-fix
nixos: luksroot: toString-ify keyFileSize usage
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/modules/system/boot/luksroot.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/nixos/modules/system/boot/luksroot.nix b/nixos/modules/system/boot/luksroot.nix index 38f8b6fd87c..02b020b61eb 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)); |