From 9bfa3f44867d232389f25d971f02d98d8e1f490a Mon Sep 17 00:00:00 2001
From: Peery <peery.coding@gmail.com>
Date: Sun, 21 Sep 2025 15:36:55 +0200
Subject: [PATCH] Check if arguments are present for setup.sh

---
 README.md                              |  2 +-
 config/ovh_ks-5_2x2TB_hdd/etc/crypttab |  3 ++-
 config/ovh_ks-5_2x2TB_hdd/etc/fstab    |  2 +-
 hardware/ovh_ks-5_2x2TB_hdd/mkfs.sh    | 12 +++++++++---
 post-debootstrap-installer.sh          |  6 ++++--
 setup.sh                               |  8 +++++++-
 6 files changed, 24 insertions(+), 9 deletions(-)
 mode change 100644 => 100755 hardware/ovh_ks-5_2x2TB_hdd/mkfs.sh

diff --git a/README.md b/README.md
index 10d5e23..b85bb64 100644
--- a/README.md
+++ b/README.md
@@ -11,7 +11,7 @@ reboot
 ./setup.sh <template> <fqdn>
 
 # example:
-apt-get update && apt-get -y dist-upgrade && git clone https://gitea.lubiland.de/lubiland/hardware-setup.git && cd hardware-setup
+apt-get update && apt-get -y dist-upgrade && git clone https://gitea.lubiland.de/pandro/hardware-setup.git && cd hardware-setup
 ./setup.sh hetzner_ax51-nvme asef.lubi.link
 
 
diff --git a/config/ovh_ks-5_2x2TB_hdd/etc/crypttab b/config/ovh_ks-5_2x2TB_hdd/etc/crypttab
index 26f4c45..194ac13 100644
--- a/config/ovh_ks-5_2x2TB_hdd/etc/crypttab
+++ b/config/ovh_ks-5_2x2TB_hdd/etc/crypttab
@@ -1,2 +1,3 @@
 # <target>      <source device>         <key file>      <options>
-root-unlocked /dev/all_vg/root none luks,discard
+root-unlocked-sda1 /dev/sda1 none luks,discard
+root-unlocked-sdb1 /dev/sdb1 none luks,discard
diff --git a/config/ovh_ks-5_2x2TB_hdd/etc/fstab b/config/ovh_ks-5_2x2TB_hdd/etc/fstab
index 5ef7d43..6eeaa41 100644
--- a/config/ovh_ks-5_2x2TB_hdd/etc/fstab
+++ b/config/ovh_ks-5_2x2TB_hdd/etc/fstab
@@ -3,6 +3,6 @@
 #
 # <file system> <dir>   <type>  <options>       <dump>  <pass>
 
-/dev/mapper/root-unlocked-sda / btrfs relatime,autodefrag 0 1
+/dev/mapper/root-unlocked-sda1 / btrfs relatime,autodefrag 0 1
 UUID=%boot_uuid% /boot ext4 relatime 0 2
 UUID=%esp_uuid% /boot/efi vfat relatime 0 2
diff --git a/hardware/ovh_ks-5_2x2TB_hdd/mkfs.sh b/hardware/ovh_ks-5_2x2TB_hdd/mkfs.sh
old mode 100644
new mode 100755
index cc5c59f..c9879b6
--- a/hardware/ovh_ks-5_2x2TB_hdd/mkfs.sh
+++ b/hardware/ovh_ks-5_2x2TB_hdd/mkfs.sh
@@ -7,6 +7,9 @@ set -e
 # free 7GB
 
 chroot="$1"
+boot="hardware/${2}/boot"
+esp="hardware/${2}/esp"
+root="hardware/${2}/root"
 
 # encrypt and unlock the root partitions
 echo -n 'Enter LUKS password: '
@@ -20,14 +23,17 @@ unset root_pwd
 
 
 # root device btrfs raid1
-mkfs.btrfs /dev/sda1
-mount /dev/sda1 "$chroot"
-btrfs device add /dev/sdb1 "$chroot" -f
+mkfs.btrfs /dev/mapper/root-unlocked-sda1
+mount /dev/mapper/root-unlocked-sda1 "$chroot"
+btrfs device add /dev/mapper/root-unlocked-sdb1 "$chroot" -f
 btrfs balance start -dconvert=raid1 -mconvert=raid1 "$chroot"
 
 # boot device ext4
+echo mkfs.ext4 "$boot" 
 mkfs.ext4 "$boot" 
+echo mkdir "$chroot/boot" 
 mkdir "$chroot/boot" 
+echo mount "$boot" "$chroot/boot" 
 mount "$boot" "$chroot/boot" 
  
 # esp device FAT
diff --git a/post-debootstrap-installer.sh b/post-debootstrap-installer.sh
index a6363be..e5a800e 100755
--- a/post-debootstrap-installer.sh
+++ b/post-debootstrap-installer.sh
@@ -3,9 +3,9 @@ export DEBIAN_FRONTEND=noninteractive
 
 
 # common config files
-cp -a /hardware-setup/base/config/* /
+cp -aR /hardware-setup/config/base/* /
 # overwrite config files
-cp -a "/hardware-setup/$1/config/*" /
+cp -aR /hardware-setup/config/$1/* /
 
 # update apt because sources.list.d is also in config/*
 apt-get update
@@ -127,3 +127,5 @@ sed -i "s/%fqdn%/$(hostname)/g" /etc/hosts
 # as unbound isn't running in the live/rescue system chroot,
 # which is where this script usually runs
 echo 'nameserver 127.0.0.1' > /etc/resolv.conf
+
+update-initramfs -u
diff --git a/setup.sh b/setup.sh
index 45865c9..af19794 100755
--- a/setup.sh
+++ b/setup.sh
@@ -1,6 +1,11 @@
 #!/bin/bash
 set -e
 
+if [[ -z $1 ]] || [[ -z $2 ]]; then
+    echo "Missing some arguments!"
+    echo "Usage: ./setup.sh <template> <fqdn>"
+    exit 1
+fi
 
 apt-get -y install lvm2 mdadm cryptsetup debootstrap btrfs-progs
 
@@ -13,7 +18,8 @@ esp="hardware/${1}/esp"
 
 # format
 chroot=/mnt/root-unlocked
-"./hardware/${1}/mkfs.sh" "$chroot"
+mkdir "$chroot"
+"./hardware/${1}/mkfs.sh" "$chroot" "$1"
 
 
 # debootstrap