summaryrefslogtreecommitdiffstats
path: root/makefu/2configs/fs
diff options
context:
space:
mode:
authormakefu <github@syntax-fehler.de>2016-06-12 19:43:50 +0200
committermakefu <github@syntax-fehler.de>2016-06-12 19:44:08 +0200
commit3eee2d3c860629404bf25dc55098f31b9d8bf318 (patch)
treece0add328682b49045a955ed63ea4f0b2c41c202 /makefu/2configs/fs
parent2f940d77f1d5f3350adbbd946f0474260d36e0b4 (diff)
ma 1 omo: finish hw merge for omo
Diffstat (limited to 'makefu/2configs/fs')
-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" ];
};