Mic92/stockholm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge remote-tracking branch 'gum/master'

Browse Source
This commit is contained in:
lassulus 2016-03-06 01:56:23 +01:00
commit 5d4c4b3896
2 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
makefu/1systems/omo.nix
View File

@ -12,11 +12,25 @@ let
# cryptsetup luksAddKey $dev tmpkey
# cryptsetup luksOpen $dev crypt0
# mkfs.xfs /dev/mapper/crypt0 -L crypt0
# omo Chassis:
# __FRONT_
# |* d2 |
# | |
# |* d3 |
# | |
# |* d0 |
# | |
# |* d1 |
# |* |
# | * r0 |
# |_______|
cryptDisk0 = byid "ata-ST2000DM001-1CH164_Z240XTT6";
cryptDisk1 = byid "ata-TP02000GB_TPW151006050068";
cryptDisk2 = byid "ata-WDC_WD20EARS-00MVWB0_WD-WCAZA5548487";
# cryptDisk2 = byid "ata-WDC_WD20EARS-00MVWB0_WD-WCAZA5548487";
cryptDisk3 = byid "ata-WDC_WD20EARS-00MVWB0_WD-WMAZA1786907";
# all physical disks
allDisks = [ rootDisk cryptDisk0 cryptDisk1 cryptDisk2 ];
allDisks = [ rootDisk cryptDisk0 cryptDisk1 cryptDisk3 ];
in {
imports =
[
@ -85,7 +99,7 @@ in {
(usbkey "home" homePartition)
(usbkey "crypt0" cryptDisk0)
(usbkey "crypt1" cryptDisk1)
(usbkey "crypt2" cryptDisk2)
(usbkey "crypt2" cryptDisk3)
];
};
loader.grub.device = rootDisk;

2
makefu/3modules/snapraid.nix
View File

@ -35,7 +35,7 @@ let
enable = mkEnableOption "snapraid";
timerConfig = mkOption {
type = types.unspecified;
type = with types;attrsOf str;
description = ''
Start snapraid service
'';