summaryrefslogtreecommitdiffstats
path: root/makefu/2configs/fs/sda-crypto-root.nix
diff options
context:
space:
mode:
authorlassulus <lass@aidsballs.de>2016-06-13 12:54:15 +0200
committerlassulus <lass@aidsballs.de>2016-06-13 12:54:15 +0200
commitb244441223ac192926da8465dea3273c225bbd68 (patch)
treeb688576b2219b6aefc5663f7d227016a590fc194 /makefu/2configs/fs/sda-crypto-root.nix
parentf832a63ce045823c1aeafec48fbe32b78ed7cd6d (diff)
parentb9c0c46b4d0f9907f1b3fc96494be96abc60c8db (diff)
Merge remote-tracking branch 'gum/master'
Diffstat (limited to 'makefu/2configs/fs/sda-crypto-root.nix')
-rw-r--r--makefu/2configs/fs/sda-crypto-root.nix6
1 files changed, 3 insertions, 3 deletions
diff --git a/makefu/2configs/fs/sda-crypto-root.nix b/makefu/2configs/fs/sda-crypto-root.nix
index b82c0e44e..5c7cdf716 100644
--- a/makefu/2configs/fs/sda-crypto-root.nix
+++ b/makefu/2configs/fs/sda-crypto-root.nix
@@ -1,16 +1,16 @@
{ config, lib, pkgs, ... }:
# sda: bootloader grub2
-# sda1: boot ext4 (label nixboot)
+# sda1: boot ext4 (label nixboot) - must be unlocked on boot if required:
+ # boot.initrd.luks.devices = [ { name = "luksroot"; device = "/dev/sda2"; allowDiscards=true; }];
# sda2: cryptoluks -> ext4
with config.krebs.lib;
{
boot = {
loader.grub.enable = true;
loader.grub.version = 2;
- loader.grub.device = "/dev/sda";
+ loader.grub.device = lib.mkDefault "/dev/sda";
- initrd.luks.devices = [ { name = "luksroot"; device = "/dev/sda2"; allowDiscards=true; }];
initrd.luks.cryptoModules = ["aes" "sha512" "sha1" "xts" ];
initrd.availableKernelModules = ["xhci_hcd" "ehci_pci" "ahci" "usb_storage" ];
};