From e8cc6dafc3418e82ab1368e2fed9da2787f5f7f6 Mon Sep 17 00:00:00 2001
From: git <git@desktop>
Date: Fri, 28 Jun 2024 11:00:50 +0200
Subject: [PATCH] Scrap idea about one script do all pre-chroot

---
 artix_scripts/pre-chroot.sh | 40 ++++++++++++-------------------------
 1 file changed, 13 insertions(+), 27 deletions(-)

diff --git a/artix_scripts/pre-chroot.sh b/artix_scripts/pre-chroot.sh
index 9eef041..b0e1e41 100755
--- a/artix_scripts/pre-chroot.sh
+++ b/artix_scripts/pre-chroot.sh
@@ -4,19 +4,11 @@ source env.sh
 
 #Parted
 pacman -Sy && \
-yes | pacman -S parted
-if [ $BIOSorEFI == "EFI"]; then
-    parted -s $DISK mklabel gpt && \
-    parted -s -a optimal $DISK mkpart "primary" "fat32" "0%" "512MiB" && \
-    parted -s $DISK set 1 esp on && \
-    parted -s -a optimal $DISK mkpart "primary" "ext4" "512MiB" "100%"
-else
-    parted -s $DISK mklabel gpt && \
-    parted -s -a optimal $DISK mkpart "primary" "fat32" "0%" "1MiB" && \
-    parted -s $DISK set 1 esp on && \
-    parted -s -a optimal $DISK mkpart "primary" "ext4" "1MiB" "100%"
-fi
-
+yes | pacman -S parted && \
+parted -s $DISK mklabel gpt && \
+parted -s -a optimal $DISK mkpart "primary" "fat32" "0%" "512MiB" && \
+parted -s $DISK set 1 esp on && \
+parted -s -a optimal $DISK mkpart "primary" "ext4" "512MiB" "100%" && \
 parted -s $DISK set 2 lvm on && \
 
 #Cryptosetup
@@ -29,25 +21,19 @@ vgcreate $LVM_N /dev/mapper/$CRYPT_N
 
 lvcreate -L 2G  $LVM_N -n volSwap && \
 lvcreate -L 10G  $LVM_N -n volRoot && \
-lvcreate -L 2G  $LVM_N -n volHome
+lvcreate -L 2G  $LVM_N -n volHome && \
 
 #Filesystems and mount
-if [ $BIOSorEFI == "EFI"]; then
-    mkfs.fat -n ESP -F 32 $DISK\1
-fi
-
+mkswap /dev/$LVM_N/volSwap && \
+mkfs.fat -n ESP -F 32 $DISK\1 && \
+mkfs.ext4 -L volRoot /dev/$LVM_N/volRoot && \
 mkfs.ext4 -L volHome /dev/$LVM_N/volHome && \
-mkswap /dev/$LVM_N/volSwap
 swapon /dev/$LVM_N/volSwap && \
+mount /dev/$LVM_N/volRoot /mnt && \
 mkdir -p /mnt/home && \
-mount /dev/$LVM_N/volHome /mnt/home
-
-if [ $BIOSorEFI == "EFI"]; then
-    mkfs.ext4 -L volRoot /dev/$LVM_N/volRoot && \
-    mount /dev/$LVM_N/volRoot /mnt && \
-    mkdir -p /mnt/boot/efi && \
-    mount $DISK\1 /mnt/boot/efi
-fi
+mount /dev/$LVM_N/volHome /mnt/home && \
+mkdir -p /mnt/boot/efi && \
+mount $DISK\1 /mnt/boot/efi && \
 
 #basestrap, fstab, chroot
 basestrap /mnt base base-devel openrc elogind-openrc linux-hardened linux-hardened-headers linux-firmware  && \