diff options
| author | Jörg Thalheim <Mic92@users.noreply.github.com> | 2017-10-16 19:00:41 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-10-16 19:00:41 +0100 |
| commit | 6838762997c566e904bf448bef94dcb6f8b88b09 (patch) | |
| tree | bdb0237a43a6d8293d82e87141c174bad1d77f89 /nixos | |
| parent | 10e79d43f61a6f73e1ac4686c280ec44d041c2bc (diff) | |
| parent | 77be4d91f7448636749049672dc78c0d08ea3d45 (diff) | |
| download | nixlib-6838762997c566e904bf448bef94dcb6f8b88b09.tar nixlib-6838762997c566e904bf448bef94dcb6f8b88b09.tar.gz nixlib-6838762997c566e904bf448bef94dcb6f8b88b09.tar.bz2 nixlib-6838762997c566e904bf448bef94dcb6f8b88b09.tar.lz nixlib-6838762997c566e904bf448bef94dcb6f8b88b09.tar.xz nixlib-6838762997c566e904bf448bef94dcb6f8b88b09.tar.zst nixlib-6838762997c566e904bf448bef94dcb6f8b88b09.zip | |
Merge pull request #30477 from Lassulus/encrypted-devices
Encrypted devices: don't override crytpoModules, fix example
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/modules/tasks/encrypted-devices.nix | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/nixos/modules/tasks/encrypted-devices.nix b/nixos/modules/tasks/encrypted-devices.nix index 6bbf335e7db7..da0c9408d891 100644 --- a/nixos/modules/tasks/encrypted-devices.nix +++ b/nixos/modules/tasks/encrypted-devices.nix @@ -36,7 +36,7 @@ let keyFile = mkOption { default = null; - example = "/root/.swapkey"; + example = "/mnt-root/root/.swapkey"; type = types.nullOr types.str; description = "File system location of keyfile. This unlocks the drive after the root has been mounted to <literal>/mnt-root</literal>."; }; @@ -67,7 +67,6 @@ in luks = { devices = map (dev: { name = dev.encrypted.label; device = dev.encrypted.blkDev; } ) keylessEncDevs; - cryptoModules = [ "aes" "sha256" "sha1" "xts" ]; forceLuksSupportInInitrd = true; }; postMountCommands = |