Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=fvbe.git;a=commitdiff;h=8f84e7bb924e55315233e271261422c41289b83d
commit 8f84e7bb924e55315233e271261422c41289b83d Author: crazy <[email protected]> Date: Sun Jul 30 19:39:56 2017 +0200 sync grub configs diff --git a/boot-files/grub-no-locales.cfg b/boot-files/grub-no-locales.cfg index b00098b..003f085 100644 --- a/boot-files/grub-no-locales.cfg +++ b/boot-files/grub-no-locales.cfg @@ -18,11 +18,12 @@ function load_video { loadfont /boot/grub/fonts/unicode.pf2 -set gfxmode=1366x768x32,1024x768x32,auto +set gfxmode=auto load_video insmod png insmod gfxterm insmod gettext +terminal_input console terminal_output gfxterm insmod gfxmenu insmod part_gpt @@ -48,27 +49,15 @@ if [ x$acpi_opt = x ]; then export acpi_opt fi -if [ x$blacklist = x ]; then - blacklist='' - export blacklist -fi - set color_normal=white/black set color_highlight=black/white set menu_color_normal=white/black set menu_color_highlight=black/white -menuentry 'Frugalware Versatile Bootable Environment' { - set gfxpayload=keep - echo "Booting..." - echo " Language set to: ${bootlang}" - echo " Keyboard set to: ${bootkeymap}" - if [ x$acpi_opt != x ]; then - echo " ACPI option: ${acpi_opt}" - fi - echo "Please wait..." - linux /boot/vmlinuz root=live:CDLABEL=FVBE rd.live.image vconsole.keymap=${bootkeymap} vconsole.font=ter-v16b locale.LANG=${bootlang} rd.luks=0 rd.lvm=0 rd.md=0 rd.dm=0 quiet audit=0 ${acpi_opt} ${blacklist} -- +menuentry 'Frugalware Versatile Bootable Environment' --class frugalware --class gnu-linux --class gnu --class os { + + linux /boot/vmlinuz root=live:CDLABEL=FVBE rd.live.image vconsole.keymap=${bootkeymap} vconsole.font=ter-v16b locale.LANG=${bootlang} rd.luks=0 rd.lvm=0 rd.md=0 rd.dm=0 quiet systemd.show_status=1 audit=0 ${acpi_opt} -- initrd /boot/initrd } @@ -87,12 +76,6 @@ menuentry 'Disable PCI ACPI only..' { configfile /boot/grub/grub.cfg } -menuentry 'Disable VirtualBox video' { - echo "Disabling VirtualBox video.." - set blacklist="rd.driver.blacklist=vboxvideo" - export blacklist - configfile /boot/grub/grub.cfg -} diff --git a/boot-files/grub.cfg b/boot-files/grub.cfg index fcca178..218fb1e 100644 --- a/boot-files/grub.cfg +++ b/boot-files/grub.cfg @@ -49,12 +49,6 @@ if [ x$acpi_opt = x ]; then export acpi_opt fi -if [ x$blacklist = x ]; then - blacklist='' - export blacklist -fi - - set color_normal=white/black set color_highlight=black/white _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
