From 78b812fb871c7e000a55ca64475808407ab18faa Mon Sep 17 00:00:00 2001 From: Christoph Cullmann Date: Sat, 2 Nov 2024 16:02:28 +0100 Subject: [PATCH] fix beta install fake raid for more common setup and alignment --- beta/hardware-configuration.nix | 21 +++++++++++++-------- beta/install.txt | 12 ++++++++++-- 2 files changed, 23 insertions(+), 10 deletions(-) diff --git a/beta/hardware-configuration.nix b/beta/hardware-configuration.nix index ffa34ca..4aedcb2 100644 --- a/beta/hardware-configuration.nix +++ b/beta/hardware-configuration.nix @@ -16,13 +16,18 @@ # amd graphics hardware.graphics.extraPackages = with pkgs; [ amdvlk rocmPackages.clr.icd ]; - FIXME - # /boot efi partition to boot in UEFI mode - fileSystems."/boot" = - { device = "/dev/disk/by-id/nvme-SAMSUNG_MZVLB1T0HBLR-000L2_S4DZNX0R362286-part1"; - fsType = "vfat"; - options = [ "fmask=0022" "dmask=0022" ]; - neededForBoot = true; - }; + fileSystems."/boot" = { + device = "/dev/disk/by-uuid/E632-D1CA"; + fsType = "vfat"; + options = [ "fmask=0022" "dmask=0022" ]; + neededForBoot = true; + }; + + # encrypted system + boot.initrd.luks.devices."crypt-system" = { + device = "/dev/disk/by-uuid/0021030c-73ab-4de5-8764-0af3bb6c415c"; + allowDiscards = true; + bypassWorkqueues = true; + }; } diff --git a/beta/install.txt b/beta/install.txt index a05061f..26d2917 100644 --- a/beta/install.txt +++ b/beta/install.txt @@ -54,9 +54,17 @@ done # take a look at the partitions lsblk +# create the RAID-0, second partitions on all disks +# we fake the raid to have proper aligned stuff and same setup as on other machines +mdadm --create --verbose --level=0 --force --raid-devices=1 /dev/md/system $DISK-part2 +sleep 5 + +# take a look at the partitions +lsblk + # create the LUKS container and open it -cryptsetup luksFormat --sector-size 4096 --batch-mode --verify-passphrase $DISK-part2 -cryptsetup luksOpen $DISK-part2 crypt-system +cryptsetup luksFormat --sector-size 4096 --batch-mode --verify-passphrase /dev/md/system +cryptsetup luksOpen /dev/md/system crypt-system sleep 5 # take a look at the partitions