Work around issue with comparing PartitionModification types

Author: Mintsuki

archinstall/lib/installer.py

@@ -1063,7 +1063,7 @@ def _add_systemd_bootloader(
 		# And in which case we should do some clean up.
 		bootctl_options = []
 
-		if efi_partition and boot_partition != efi_partition:
+		if efi_partition and boot_partition.mountpoint != efi_partition.mountpoint:
 			bootctl_options.append(f'--esp-path={efi_partition.mountpoint}')
 			bootctl_options.append(f'--boot-path={boot_partition.mountpoint}')
 
@@ -1307,7 +1307,7 @@ def _add_limine_bootloader(
 		config_contents = 'timeout: 5\n'
 
 		path_root = 'boot()'
-		if efi_partition and boot_partition != efi_partition:
+		if efi_partition and boot_partition.mountpoint != efi_partition.mountpoint:
 			path_root = f'uuid({boot_partition.partuuid})'
 
 		for kernel in self.kernels:

build_iso.sh

@@ -2,6 +2,8 @@
 
 set -e
 
+rm -f archvm/efivars.fd
+
 packages_file="/tmp/archlive/packages.x86_64"
 
 # Packages to add to the archiso profile packages
@@ -21,15 +23,78 @@ mkdir -p /tmp/archlive/airootfs/root/archinstall-git
 cp -r . /tmp/archlive/airootfs/root/archinstall-git
 
 cat <<- _EOF_ | tee /tmp/archlive/airootfs/root/.zprofile
+    systemctl stop sshd
+
 	cd archinstall-git
 	rm -rf dist
 
+    git config --global user.name aaa
+    git config --global user.email aaa
+
+    git checkout limine-update
+    git checkout limine-update2
+    git checkout limine-update3
+    git checkout limine-update4
+
+    git checkout merged-prs
+    git reset --hard master
+    git merge --no-edit --no-ff limine-update
+    git merge --no-edit --no-ff limine-update2
+    git merge --no-edit --no-ff limine-update3
+    git merge --no-edit --no-ff limine-update4
+
 	python -m build --wheel --no-isolation
 	pip install dist/archinstall*.whl --break-system-packages
 
+    mkfs.fat /dev/sda1
+    mkfs.fat /dev/sda2
+    mkfs.ext4 -F /dev/sda3
+
+    mount /dev/sda3 /mnt
+    mkdir /mnt/boot
+    mount /dev/sda2 /mnt/boot
+    mkdir /mnt/boot/efi
+    mount /dev/sda1 /mnt/boot/efi
+
+    cat >archinstall.conf <<'EOF'
+{
+    "archinstall-language": "English",
+    "audio_config": null,
+    "bootloader": "Limine",
+    "custom_commands": [],
+    "disk_config": {
+        "config_type": "pre_mounted_config",
+        "mountpoint": "/mnt"
+    },
+    "hostname": "archlinux",
+    "kernels": [
+        "linux"
+    ],
+    "locale_config": {
+        "kb_layout": "us",
+        "sys_enc": "UTF-8",
+        "sys_lang": "en_US"
+    },
+    "network_config": {
+        "type": "iso"
+    },
+    "ntp": false,
+    "packages": [
+        "dhcpcd"
+    ],
+    "parallel_downloads": 0,
+    "services": [],
+    "swap": true,
+    "timezone": "Europe/Rome",
+    "version": null
+}
+EOF
+
 	echo "This is an unofficial ISO for development and testing of archinstall. No support will be provided."
 	echo "This ISO was built from Git SHA $GITHUB_SHA"
 	echo "Type archinstall to launch the installer."
+
+    archinstall --silent --config archinstall.conf
 _EOF_
 
 pacman --noconfirm -S archiso