From ca2f5460406503bf9bf93549496fb26f82bfdae7 Mon Sep 17 00:00:00 2001
From: eichehome <eichehome@gmx.de>
Date: Tue, 26 Sep 2023 17:22:27 +0200
Subject: [PATCH] =?UTF-8?q?GUIDs=20zu=20UUIDs=20ge=C3=A4ndert,=20sodass=20?=
 =?UTF-8?q?mounting=20funktioniert.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 build/archos-build.uefi | 31 +++++++++++++++++++------------
 1 file changed, 19 insertions(+), 12 deletions(-)

diff --git a/build/archos-build.uefi b/build/archos-build.uefi
index 132506d..2ee425e 100644
--- a/build/archos-build.uefi
+++ b/build/archos-build.uefi
@@ -1,5 +1,6 @@
 #!/usr/bin/bash
-DEVICE="ArchOS.raw"
+#DEVICE="ArchOS.raw"
+DEVICE="/dev/vda"
 declare -A GUID=""
 GUID=([ESP]="c12a7328-f81f-11d2-ba4b-00a0c93ec93b" [ROOT]="4f68bce3-e8cd-4db1-96e7-fbcaf984b709")
 
@@ -16,7 +17,7 @@ SizeMaxBytes=512M
 Format=vfat
 EOF
 
-cat > 20-root.conf << EOF
+cat > 30-root.conf << EOF
 [Partition]
 Type=root
 Label=ArchOS Build Root
@@ -24,7 +25,7 @@ Format=ext4
 GrowFileSystem=yes
 EOF
 
-cat > 30-swap.conf << EOF
+cat > 20-swap.conf << EOF
 [Partition]
 Type=swap
 Label=ArchOS Build Swap
@@ -36,14 +37,20 @@ EOF
 cd ..
 
 # Temporär
-touch "${DEVICE}"
+#touch "${DEVICE}"
 
-systemd-repart --definitions=repart --dry-run=no --size=auto --empty=allow "${DEVICE}"
+#systemd-repart --definitions=repart --dry-run=no --size=auto --empty=allow "${DEVICE}"
+systemd-repart --definitions=repart --dry-run=no --empty=allow "${DEVICE}"
 #systemd-repart --definitions=repart --dry-run=no --size=10G --empty=create "${DEVICE}"
 
-mount /dev/disk/by-partuuid/"${GUID[ROOT]}" /mnt
+UUID_ROOT=$(lsblk -lo PARTTYPE,PARTUUID "${DEVICE}" | grep -i "${GUID[ROOT]}" | awk '{ print $2 }')
+UUID_ESP=$(lsblk -lo PARTTYPE,PARTUUID "${DEVICE}" | grep -i "${GUID[ESP]}" | awk '{ print $2 }')
+declare -A UUID=""
+UUID=( [ROOT]="${UUID_ROOT}" [ESP]="${UUID_ESP}" )
+
+mount /dev/disk/by-partuuid/"${UUID[ROOT]}" /mnt
 mkdir -p /mnt/boot
-mount /dev/disk/by-partuuid/"${GUID[ESP]}" /mnt/boot
+mount /dev/disk/by-partuuid/"${UUID[ESP]}" /mnt/boot
 
 # Pacman im Live-System konfigurieren
 sed -i 's/#\(Color\)/\1/' /etc/pacman.conf
@@ -57,12 +64,12 @@ KEYMAP="de-latin1"
 HOSTNAME_NEW="arch-build"
 
 KERNEL="linux"
-BASE=(base)
-INITRD=(mkinitcpio)
+BASE=( base )
+INITRD=( mkinitcpio )
 MICROCODE="amd-ucode"
-WIFI_BACKEND=(wpa_supplicant)
-NETWORK=(iptables-nft firewalld inetutils avahi networkmanager networkmanager-openconnect networkmanager-openvpn networkmanager-pptp networkmanager-vpnc "${WIFI_BACKEND[@]}" modemmanager)
-OTHER=(vim mkosi git lynx openssh htop bash-completion man-db man-pages reflector "${BASE[@]}" "${INITRD[@]}" plymouth linux-firmware xdg-utils)
+WIFI_BACKEND=( wpa_supplicant )
+NETWORK=( iptables-nft firewalld inetutils avahi networkmanager networkmanager-openconnect networkmanager-openvpn networkmanager-pptp networkmanager-vpnc "${WIFI_BACKEND[@]}" modemmanager )
+OTHER=( vim mkosi git lynx openssh htop bash-completion man-db man-pages reflector "${BASE[@]}" "${INITRD[@]}" plymouth linux-firmware xdg-utils )
 
 pacstrap /mnt "${KERNEL}" "${MICROCODE}" "${NETWORK[@]}" "${OTHER[@]}"
 arch-chroot /mnt hwclock --systohc