Makefile

@@ -1,20 +1,10 @@
 # Known configs:
 # * airgap
 
-CONFIG ?= airgap
-
 .PHONY: default
-default: out/archlinux-baseline-arch-$(CONFIG)-x86_64.iso
+default: out/archlinux-baseline-arch-airgap-x86_64.iso
 
-.PHONY: vars
-vars:
-	@echo "CONFIG ?= $(CONFIG)"
-
-.PHONY: clean
-clean:
-	rm -rf out work || true
-
-out/archlinux-baseline-arch-%-x86_64.iso: configs/%/
+out/archlinux-baseline-arch-%-x86_64.iso: configs/%
 	$(MAKE) docker-airgap-builder
 	mkdir -p out
 	docker run --rm --privileged --volume "$(PWD)/out:/out" airgap-builder $<

configs/airgap/efiboot/loader/entries/01-archiso-x86_64-linux.conf

@@ -1,4 +1,4 @@
 title   Airgap Arch Linux (x86_64, UEFI)
 linux   /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux
 initrd  /%INSTALL_DIR%/boot/x86_64/initramfs-linux.img
-options archisobasedir=%INSTALL_DIR% archisodevice=UUID=%ARCHISO_UUID% nomodeset
+options archisobasedir=%INSTALL_DIR% archisodevice=UUID=%ARCHISO_UUID%

configs/airgap/grub/grub.cfg

@@ -62,7 +62,7 @@ timeout_style=menu
 
 menuentry "Airgap Arch Linux (%ARCH%, ${archiso_platform})" --class arch --class gnu-linux --class gnu --class os --id 'archlinux' {
     set gfxpayload=keep
-    linux /%INSTALL_DIR%/boot/%ARCH%/vmlinuz-linux archisobasedir=%INSTALL_DIR% archisodevice=UUID=${ARCHISO_UUID} nomodeset
+    linux /%INSTALL_DIR%/boot/%ARCH%/vmlinuz-linux archisobasedir=%INSTALL_DIR% archisodevice=UUID=${ARCHISO_UUID}
     initrd /%INSTALL_DIR%/boot/%ARCH%/initramfs-linux.img
 }
 

configs/airgap/syslinux/syslinux-linux.cfg

@@ -2,4 +2,4 @@ LABEL arch
 MENU LABEL Airgap Arch Linux (x86_64, BIOS)
 LINUX /%INSTALL_DIR%/boot/%ARCH%/vmlinuz-linux
 INITRD /%INSTALL_DIR%/boot/%ARCH%/initramfs-linux.img
-APPEND archisobasedir=%INSTALL_DIR% archisodevice=UUID=%ARCHISO_UUID% nomodeset
+APPEND archisobasedir=%INSTALL_DIR% archisodevice=UUID=%ARCHISO_UUID%