diff --git a/morph/grid/production/storage003-config.nix b/morph/grid/production/storage003-config.nix index e83546adbcdab2fd35d990a13550dd3907d7226b..5b3f5adf969317322b2c39014e6500294b5f3c02 100644 --- a/morph/grid/production/storage003-config.nix +++ b/morph/grid/production/storage003-config.nix @@ -4,5 +4,5 @@ "prefixLength" = 30; "gateway" = "45.83.89.185"; "gatewayInterface" = "eno1"; - "grubDeviceID" = "wwn-0x5000cca248c31469"; + "grubDeviceID" = "wwn-0x5000039a8bc00766"; } diff --git a/morph/grid/production/storage003-hardware.nix b/morph/grid/production/storage003-hardware.nix index 607943b19117106b532f7c2c2032aea31fce04e3..9882f5372cecd52794e1500bdef30e367008496e 100644 --- a/morph/grid/production/storage003-hardware.nix +++ b/morph/grid/production/storage003-hardware.nix @@ -1,30 +1,31 @@ # Do not modify this file! It was generated by ‘nixos-generate-config’ # and may be overwritten by future invocations. Please make changes # to /etc/nixos/configuration.nix instead. -{ config, lib, pkgs, ... }: +{ config, lib, pkgs, modulesPath, ... }: { imports = - [ <nixpkgs/nixos/modules/installer/scan/not-detected.nix> + [ (modulesPath + "/installer/scan/not-detected.nix") ]; - boot.initrd.availableKernelModules = [ "ahci" "xhci_pci" "ehci_pci" "megaraid_sas" "usbhid" "sd_mod" ]; + boot.initrd.availableKernelModules = [ "ahci" "xhci_pci" "ehci_pci" "megaraid_sas" "usbhid" ]; boot.initrd.kernelModules = [ ]; boot.kernelModules = [ "kvm-intel" ]; boot.extraModulePackages = [ ]; + boot.supportedFilesystems = [ "zfs" ]; fileSystems."/" = - { device = "/dev/disk/by-uuid/daf0b345-97da-46bc-b9df-500d771ec375"; + { device = "/dev/disk/by-uuid/240fc1f6-cd55-48a3-ac80-5b3550a32ef5"; fsType = "ext4"; }; fileSystems."/boot" = - { device = "/dev/disk/by-uuid/a1843705-f4e9-4805-924c-19f464d23da7"; + { device = "/dev/disk/by-label/boot"; fsType = "ext4"; }; # Manually created using: - # zpool create -f -m legacy -o ashift=12 root raidz /dev/disk/by-id/{wwn-0x5000cca249d43969,wwn-0x5000cca248dd1f83,wwn-0x5000cca249d44a67,wwn-0x5000cca249d46730,wwn-0x5000cca25dcc719c,wwn-0x5000cca25dcc0241,wwn-0x5000cca24ac2b2df} + # zpool create -f -m legacy -o ashift=12 root raidz /dev/disk/by-id/{wwn-0x5000cca249d43969,wwn-0x5000039a8bc0075e,wwn-0x5000cca249d44a67,wwn-0x5000cca249d46730,wwn-0x5000cca25dcc719c,wwn-0x5000cca25dcc0241,wwn-0x5000039a8bc00765} fileSystems."/storage" = { device = "root"; fsType = "zfs";