Skip to content

M
mkimage-profiles
Commit 2d9d57b5 authored by Anton Midyukov's avatar Anton Midyukov
Browse files
Options

grub: drop BOOTVGA parameter from kernel cmdline

Doesn't work with grub 2.12. Show warning: "vga=normal is deprecated. Use set gfxpayload=text before linux command instead."
parent d3dd5246
Show whitespace changes
Inline Side-by-side
Showing with 6 additions and 15 deletions
features.in/grub/README
View file @ 2d9d57b5
......@@ -21,8 +21,6 @@
* BOOTLOADER -- isolinux (реализовано с оглядкой на grub/grub4);
* BOOTVGA -- видеорежим, запрашиваемый у ядра (параметр vga=);
* GRUB_UI -- тип интерфейса (если указан gfxboot, то графический,
иначе текстовый);
......
features.in/grub/cfg.in/20install2.cfg
View file @ 2d9d57b5
menuentry $"Install "'@distro@' --hotkey 'i' --id 'linux' {
echo $"Loading Linux vmlinuz$KFLAVOUR ..."
linux /boot/vmlinuz$KFLAVOUR fastboot @initrd_bootargs@ @stagename@=altinst ramdisk_size=@altinst_size@ vga=@bootvga@ @bootargs@ lang=$lang lowmem
linux /boot/vmlinuz$KFLAVOUR fastboot @initrd_bootargs@ @stagename@=altinst ramdisk_size=@altinst_size@ @bootargs@ lang=$lang lowmem
echo $"Loading initial ramdisk ..."
initrd /boot/@initrd@$KFLAVOUR.@initrd_ext@
}
features.in/grub/cfg.in/21live-install.cfg
View file @ 2d9d57b5
......@@ -2,7 +2,7 @@
menuentry $"Install "'@distro@' --hotkey 'i' --id 'linux' {
savedefault
echo $"Loading Linux vmlinuz$KFLAVOUR ..."
linux /boot/vmlinuz$KFLAVOUR fastboot live @initrd_bootargs@ @stagename@=live init=/usr/sbin/install2-init ramdisk_size=@live_size@ lowmem vga=@bootvga@ @bootargs@ lang=$lang
linux /boot/vmlinuz$KFLAVOUR fastboot live @initrd_bootargs@ @stagename@=live init=/usr/sbin/install2-init ramdisk_size=@live_size@ lowmem @bootargs@ lang=$lang
echo $"Loading initial ramdisk ..."
initrd /boot/@initrd@$KFLAVOUR.@initrd_ext@
}
features.in/grub/cfg.in/30live.cfg
View file @ 2d9d57b5
menuentry $"LiveCD (no hard disk needed)" --id 'live' {
savedefault
echo $"Loading Linux vmlinuz$KFLAVOUR ..."
linux /boot/vmlinuz$KFLAVOUR fastboot live @initrd_bootargs@ @stagename@=live ramdisk_size=@live_size@ lowmem vga=@bootvga@ @bootargs@ lang=$lang
linux /boot/vmlinuz$KFLAVOUR fastboot live @initrd_bootargs@ @stagename@=live ramdisk_size=@live_size@ lowmem @bootargs@ lang=$lang
echo $"Loading initial ramdisk ..."
initrd /boot/@initrd@$KFLAVOUR.@initrd_ext@
}
......
features.in/grub/cfg.in/32live_rw.cfg
View file @ 2d9d57b5
menuentry $"LiveCD with sessions support" --id 'session' {
savedefault
echo $"Loading Linux vmlinuz$KFLAVOUR ..."
linux /boot/vmlinuz$KFLAVOUR fastboot live @initrd_bootargs@ @stagename@=live ramdisk_size=@live_size@ live_rw vga=@bootvga@ @bootargs@ lang=$lang
linux /boot/vmlinuz$KFLAVOUR fastboot live @initrd_bootargs@ @stagename@=live ramdisk_size=@live_size@ live_rw @bootargs@ lang=$lang
echo $"Loading initial ramdisk ..."
initrd /boot/@initrd@$KFLAVOUR.@initrd_ext@
}
features.in/grub/cfg.in/33live-rescue.cfg
View file @ 2d9d57b5
menuentry $"Rescue LiveCD" --id 'rescue' {
savedefault
echo $"Loading Linux vmlinuz$KFLAVOUR ..."
linux /boot/vmlinuz$KFLAVOUR fastboot live @initrd_bootargs@ @stagename@=live systemd.unit=live-rescue.target ramdisk_size=@live_size@ nosplash vga=@bootvga@ @rescue_bootargs@ lang=$lang lowmem
linux /boot/vmlinuz$KFLAVOUR fastboot live @initrd_bootargs@ @stagename@=live systemd.unit=live-rescue.target ramdisk_size=@live_size@ nosplash @rescue_bootargs@ lang=$lang lowmem
echo $"Loading initial ramdisk ..."
initrd /boot/@initrd@$KFLAVOUR.@initrd_ext@
}
......
features.in/grub/cfg.in/34live-rescue_rw.cfg
View file @ 2d9d57b5
menuentry $"Rescue LiveCD with sessions support" --id 'rescue_session' {
savedefault
echo $"Loading Linux vmlinuz$KFLAVOUR ..."
linux /boot/vmlinuz$KFLAVOUR fastboot live @initrd_bootargs@ @stagename@=live systemd.unit=live-rescue.target ramdisk_size=@live_size@ nosplash vga=@bootvga@ @rescue_bootargs@ lang=$lang lowmem
linux /boot/vmlinuz$KFLAVOUR fastboot live @initrd_bootargs@ @stagename@=live systemd.unit=live-rescue.target ramdisk_size=@live_size@ nosplash @rescue_bootargs@ lang=$lang lowmem
echo $"Loading initial ramdisk ..."
initrd /boot/@initrd@$KFLAVOUR.@initrd_ext@
}
......
features.in/grub/config.mk
View file @ 2d9d57b5
......@@ -5,9 +5,6 @@ ifeq (,$(filter-out i586 x86_64 ppc64le aarch64 riscv64 loongarch64,$(ARCH)))
use/grub: sub/stage1 $(ISOHYBRID:%=use/isohybrid)
@$(call add_feature)
ifeq (,$(filter-out i586 x86_64,$(ARCH)))
@$(call try,BOOTVGA,normal)
endif
@$(call set,RELNAME,ALT ($(IMAGE_NAME)))
@$(call xport,GRUB_DEFAULT)
......
features.in/grub/generate.mk
View file @ 2d9d57b5
......@@ -93,10 +93,6 @@ bootargs: clean
sed -i "s,@rescue_bootargs@,$(RESCUE_BOOTARGS)," $(DSTCFGS); \
fi; \
sed -i "s,@rescue_bootargs@,," $(DSTCFGS)
@if [ -n "$(BOOTVGA)" ]; then \
sed -i "s,@bootvga@,$(BOOTVGA)," $(DSTCFGS); \
fi; \
sed -i "s,@bootvga@,,;s,vga= ,," $(DSTCFGS)
@if [ -n "$(LOCALE)" ]; then \
sed -i "s,@LOCALE@,$(LOCALE),g" $(DSTCFGS); \
else \
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment