diff --git a/features.in/syslinux/README b/features.in/syslinux/README index 69b51e63..e60f18b8 100644 --- a/features.in/syslinux/README +++ b/features.in/syslinux/README @@ -14,7 +14,9 @@ * use/syslinux/%.cfg -- подключение кусочков конфигурации. Переменные generate.mk: +* BOOTARGS -- дополнительные аргументы загрузчику; * BOOTLOADER -- isolinux (реализовано с оглядкой на syslinux/syslinux4); +* BOOTVGA -- видеорежим, запрашиваемый у ядра (параметр vga=); * SYSLINUX_UI -- модуль интерфейса (если не указан, то внутренний prompt); * SYSLINUX_MODULES -- модули .com или .c32 (перечисляются без расширения); * SYSLINUX_CFG -- дополнительные кусочки конфигурации (например, localboot). diff --git a/features.in/syslinux/cfg.in/20install2.cfg b/features.in/syslinux/cfg.in/20install2.cfg index e5b99561..42f3dbd1 100644 --- a/features.in/syslinux/cfg.in/20install2.cfg +++ b/features.in/syslinux/cfg.in/20install2.cfg @@ -1,5 +1,5 @@ label linux menu label ^Install @relname@ kernel alt0/vmlinuz - append initrd=alt0/full.cz changedisk fastboot automatic=method:cdrom ramdisk_size=@altinst_size@ showopts vga=0x314 @bootargs@ + append initrd=alt0/full.cz changedisk fastboot automatic=method:cdrom ramdisk_size=@altinst_size@ showopts vga=@bootvga@ @bootargs@ diff --git a/features.in/syslinux/cfg.in/30live.cfg b/features.in/syslinux/cfg.in/30live.cfg index aa9dfc4d..da2a76c5 100644 --- a/features.in/syslinux/cfg.in/30live.cfg +++ b/features.in/syslinux/cfg.in/30live.cfg @@ -1,5 +1,5 @@ label live menu label ^LiveCD (no hard disk needed) kernel alt0/vmlinuz - append initrd=alt0/full.cz fastboot live automatic=method:cdrom ramdisk_size=@live_size@ stagename=live showopts lowmem vga=0x314 @bootargs@ + append initrd=alt0/full.cz fastboot live automatic=method:cdrom ramdisk_size=@live_size@ stagename=live showopts lowmem vga=@bootvga@ @bootargs@ diff --git a/features.in/syslinux/cfg.in/32live_rw.cfg b/features.in/syslinux/cfg.in/32live_rw.cfg index 3bd17372..017319d7 100644 --- a/features.in/syslinux/cfg.in/32live_rw.cfg +++ b/features.in/syslinux/cfg.in/32live_rw.cfg @@ -1,5 +1,5 @@ label session menu label LiveCD with ^sessions support kernel alt0/vmlinuz - append initrd=alt0/full.cz fastboot live automatic=method:cdrom ramdisk_size=@live_size@ stagename=live showopts live_rw vga=0x314 @bootargs@ + append initrd=alt0/full.cz fastboot live automatic=method:cdrom ramdisk_size=@live_size@ stagename=live showopts live_rw vga=@bootvga@ @bootargs@ diff --git a/features.in/syslinux/config.mk b/features.in/syslinux/config.mk index 8ea4741a..0620c33a 100644 --- a/features.in/syslinux/config.mk +++ b/features.in/syslinux/config.mk @@ -3,6 +3,7 @@ use/syslinux: sub/stage1 @$(call add_feature) @$(call add,STAGE1_PACKAGES,syslinux) @$(call try,META_SYSTEM_ID,SYSLINUX) + @$(call try,BOOTVGA,0x314) @$(call set,RELNAME,ALT ($(IMAGE_NAME))) # UI is overwritten diff --git a/features.in/syslinux/generate.mk b/features.in/syslinux/generate.mk index 390cdbdb..f2bb3d7c 100644 --- a/features.in/syslinux/generate.mk +++ b/features.in/syslinux/generate.mk @@ -85,6 +85,10 @@ bootargs: clean sed -i "s,@rescue_bootargs@,$(RESCUE_BOOTARGS)," $(DSTDIR)/*.cfg; \ fi; \ sed -i "s,@rescue_bootargs@,," $(DSTDIR)/*.cfg + @if [ -n "$(BOOTVGA)" ]; then \ + sed -i "s,@bootvga@,$(BOOTVGA)," $(DSTDIR)/*.cfg; \ + fi; \ + sed -i "s,@bootvga@,,;s,vga= ,," $(DSTDIR)/*.cfg clean: copy @if [ "$(SYSLINUX_UI)" = gfxboot ]; then \