regular.mk: add to jeos 'xdriver=vesa' for Legacy, 'xdriver=fbdev' for EFI

nomodeset was pointless to add, since drm kernel modules were missing. But need to add the correct xdriver. For UEFI it's fbdev, for Legacy BIOS it's vesa.

regular.mk: add to jeos 'xdriver=vesa' for Legacy, 'xdriver=fbdev' for EFI
1a7fdc62 · Anton Midyukov · d2260e21 · 1a7fdc62
Commit 1a7fdc62 authored Sep 06, 2022 by Anton Midyukov
Hide whitespace changes
Inline Side-by-side

Showing with 8 additions and 1 deletion

regular.mk conf.d/regular.mk +8 -1

No files found.
--- a/conf.d/regular.mk
+++ b/conf.d/regular.mk
@@ -91,7 +91,14 @@ distro/.regular-jeos: distro/.regular-jeos-base \
 	use/install2/cleanup/everything use/install2/cleanup/kernel/everything \
 	use/syslinux/lateboot.cfg use/cleanup/jeos
 	@$(call add,BASE_PACKAGES,make-initrd-mdadm cpio)
-	@$(call add,STAGE2_BOOTARGS,nomodeset)
+ifeq (,$(filter-out i586 x86_64,$(ARCH)))
+	@$(call add,STAGE2_BOOTARGS,xdriver=vesa)
+ifeq (x86_64,$(ARCH))
+	@$(call add,EFI_BOOTARGS,xdriver=fbdev)
+endif
+else
+	@$(call add,STAGE2_BOOTARGS,xdriver=fbdev)
+endif

 distro/.regular-jeos-full: distro/.regular-jeos use/install2/vmguest \
 	use/volumes/jeos use/ntp/chrony use/bootloader/grub \