From a68144db9fef2a46a5817da7449fe2ba89e600ee Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Mon, 11 Feb 2019 17:52:22 +0100
Subject: ma gum.r: also load dm-raid at startup of kernel to mount
 binaergewitter

---
 makefu/1systems/gum/hardware-config.nix | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

(limited to 'makefu')

diff --git a/makefu/1systems/gum/hardware-config.nix b/makefu/1systems/gum/hardware-config.nix
index 542b79fe..857fad7a 100644
--- a/makefu/1systems/gum/hardware-config.nix
+++ b/makefu/1systems/gum/hardware-config.nix
@@ -41,36 +41,36 @@ in {
   boot.loader.grub.enable = true;
   boot.loader.grub.version = 2;
   boot.loader.grub.devices = [ main-disk ];
-  boot.initrd.kernelModules = [  "dm-raid" ];
+  boot.initrd.kernelModules = [  "dm-raid" "dm_cache" ];
   boot.initrd.availableKernelModules = [
     "ata_piix" "vmw_pvscsi" "virtio_pci" "sd_mod" "ahci"
     "xhci_pci" "ehci_pci" "ahci" "sd_mod"
   ];
-  boot.kernelModules = [ "dm-thin-pool" "kvm-intel"  ];
+  boot.kernelModules = [ "dm-raid" "dm_cache" "dm-thin-pool" "kvm-intel"  ];
   hardware.enableRedistributableFirmware = true;
   fileSystems."/" = {
-    device = "/dev/mapper/nixos-root";
+    device = "/dev/nixos/root";
     fsType = "ext4";
   };
   fileSystems."/var/lib" = {
-    device = "/dev/mapper/nixos-lib";
+    device = "/dev/nixos/lib";
     fsType = "ext4";
   };
   fileSystems."/var/log" = {
-    device = "/dev/mapper/nixos-log";
+    device = "/dev/nixos/log";
     fsType = "ext4";
   };
   fileSystems."/var/download" = {
-    device = "/dev/mapper/nixos-download";
+    device = "/dev/nixos/download";
     fsType = "ext4";
   };
   fileSystems."/var/www/binaergewitter" = {
-    device = "/dev/mapper/nixos-binaergewitter";
+    device = "/dev/nixos/binaergewitter";
     fsType = "ext4";
-    options = [ "nofail" ];
+    options = [ "nofail" "x-systemd.automount" "x-systemd.device-timeout=5s" "x-systemd.mount-timeout=5s" ];
   };
   fileSystems."/var/lib/borgbackup" = {
-    device = "/dev/mapper/nixos-backup";
+    device = "/dev/nixos/backup";
     fsType = "ext4";
   };
   fileSystems."/boot" = {
-- 
cgit v1.2.3