config/etc/apt/sources.list.d/debian-security.list

@@ -1,2 +1,2 @@
-deb https://security.debian.org/debian-security trixie-security main contrib non-free non-free-firmware
+deb https://security.debian.org/debian-security bookworm-security main contrib non-free non-free-firmware
-deb https://deb.debian.org/debian-security trixie-security main contrib non-free non-free-firmware
+deb https://deb.debian.org/debian-security bookworm-security main contrib non-free non-free-firmware

config/etc/apt/sources.list.d/debian.list

@@ -1 +1 @@
-deb https://deb.debian.org/debian trixie main contrib non-free non-free-firmware
+deb https://deb.debian.org/debian bookworm main contrib non-free non-free-firmware

config/etc/crypttab

@@ -1,2 +1,2 @@
 # <target>      <source device>         <key file>      <options>
-root-unlocked /dev/mapper/all_vg-root_striped none luks,discard
+root-unlocked UUID=%root_uuid% none luks,discard

config/etc/fstab

@@ -7,4 +7,5 @@
 UUID=%boot_uuid% /boot ext4 relatime 0 2
 UUID=%esp_uuid% /boot/efi vfat relatime 0 2
 
-/dev/mapper/all_vg-longhorn_striped /longhorn ext4 relatime 0 2
+UUID=%disk1_uuid% /longhorn/01 ext4 relatime 0 2
+UUID=%disk2_uuid% /longhorn/02 ext4 relatime 0 2

hardware/hetzner_ax51-nvme/boot

@@ -1 +1 @@
-/dev/nvme0n1p1
+/dev/nvme0n1p2

hardware/hetzner_ax51-nvme/esp

@@ -1 +1 @@
-/dev/nvme0n1p2
+/dev/nvme0n1p3

hardware/hetzner_ax51-nvme/longhorn

@@ -1 +0,0 @@
-/dev/mapper/all_vg-longhorn_striped

hardware/hetzner_ax51-nvme/parted.sh

@@ -1,21 +1,22 @@
 #!/bin/bash
 set -e
 
+
+# / 1020GB
+# /boot 1GB
+# /boot/efi 1GB
+# free 0GB
+
 parted -- /dev/nvme0n1 mklabel msdos
-parted -- /dev/nvme0n1 mkpart primary 1 1GB # /boot
+parted -- /dev/nvme0n1 mkpart primary 1 1020GB
-parted -- /dev/nvme0n1 mkpart primary 1GB 2GB #/boot/efi
+parted -- /dev/nvme0n1 mkpart primary 1020GB 1022GB
-parted -- /dev/nvme0n1 mkpart primary 2GB -1 # LVM
+parted -- /dev/nvme0n1 mkpart primary 1022GB 1024GB
 # set flag for ESP
-parted -- /dev/nvme0n1 set 2 boot on
+parted -- /dev/nvme0n1 set 3 boot on
 
 parted -- /dev/nvme1n1 mklabel gpt
-parted -- /dev/nvme1n1 mkpart primary 1 -1 # LVM
+parted -- /dev/nvme1n1 mkpart primary 1 -1
 parted -- /dev/nvme2n1 mklabel gpt
-parted -- /dev/nvme2n1 mkpart primary 1 -1 # LVM
+parted -- /dev/nvme2n1 mkpart primary 1 -1
-
-pvcreate /dev/nvme0n1p3 /dev/nvme1n1p1 /dev/nvme2n1p1
-vgcreate all_vg /dev/nvme0n1p3 /dev/nvme1n1p1 /dev/nvme2n1p1
-lvcreate --stripes 3 --extents 100GB -n root_striped
-lvcreate --stripes 3 --extents 100%FREE -n longhorn_striped longhorn
 
 sleep 1

hardware/hetzner_ax51-nvme/root

@@ -1 +1 @@
-/dev/mapper/all_vg-root_striped
+/dev/nvme0n1p1

post-debootstrap-installer.sh

@@ -42,15 +42,21 @@ if [ -d /sys/firmware/efi ]; then
 else
     apt-get -y install grub-pc
 
-    boot_disk=$(mount | grep ' on /boot ' | cut -d' ' -f1)
+    root_disk="/dev/$(lsblk -no pkname $(cryptsetup status root-unlocked | grep device | perl -pe 's#.*device.* (.*)#$1#') | sort | head -n1)"
-    grub-install "$boot_disk"
+    grub-install "$root_disk"
 fi
 
 # edit uuids in fstab
+root_uuid=$(blkid --output value "$(cryptsetup status root-unlocked | grep device | perl -pe 's#.*device.* (.*)#$1#')" | head -n1)
 boot_uuid=$(blkid --output value "/hardware-setup/hardware/${1}/boot" | head -n1)
 esp_uuid=$(blkid --output value "/hardware-setup/hardware/${1}/esp" | head -n1)
+disk1_uuid=$(blkid --output value "/dev/nvme1n1p1" | head -n1)
+disk2_uuid=$(blkid --output value "/dev/nvme2n1p1" | head -n1)
+sed -i "s/%root_uuid%/${root_uuid}/" /etc/crypttab
 sed -i "s/%boot_uuid%/${boot_uuid}/" /etc/fstab
 sed -i "s/%esp_uuid%/${esp_uuid}/" /etc/fstab
+sed -i "s/%disk1_uuid%/${disk1_uuid}/" /etc/fstab
+sed -i "s/%disk2_uuid%/${disk2_uuid}/" /etc/fstab
 
 # install longhorn dependencies
 apt-get -y install open-iscsi nfs-common

setup.sh

@@ -10,7 +10,6 @@ apt-get -y install mdadm cryptsetup debootstrap
 root="hardware/${1}/root"
 boot="hardware/${1}/boot"
 esp="hardware/${1}/esp"
-longhorn="hardware/${1}/longhorn"
 
 # encrypt and unlock root device
 echo -n 'Enter luks password: '
@@ -41,13 +40,15 @@ mkdir "$chroot/boot/efi"
 mount "$esp" "$chroot/boot/efi"
 
 # additional data disks
-mkfs.ext4 "$longhorn"
+mkfs.ext4 /dev/nvme1n1p1
-mkdir "$chroot/longhorn"
+mkdir --parents "$chroot/longhorn/01"
+mkfs.ext4 /dev/nvme2n1p1
+mkdir --parents "$chroot/longhorn/02"
 
 
 # debootstrap
 
-debootstrap --variant=minbase --arch=amd64 trixie "$chroot" https://deb.debian.org/debian/
+debootstrap --variant=minbase --arch=amd64 bookworm "$chroot" https://deb.debian.org/debian/
 
 mount -t proc none "$chroot/proc"
 mount -t sysfs none "$chroot/sys"