From cf8a63be9f792f98c92559d7a4da54288c82c59a Mon Sep 17 00:00:00 2001 From: Peery Date: Sun, 21 Sep 2025 15:36:55 +0200 Subject: [PATCH] Check if arguments are present for setup.sh --- hardware/ovh_ks-5_2x2TB_hdd/mkfs.sh | 12 +++++++++--- setup.sh | 6 ++++++ 2 files changed, 15 insertions(+), 3 deletions(-) mode change 100644 => 100755 hardware/ovh_ks-5_2x2TB_hdd/mkfs.sh 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..af4f9fe --- 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/${1}/boot" +esp="hardware/${1}/esp" +root="hardware/${1}/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/setup.sh b/setup.sh index 45865c9..dd46aff 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