Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=fvbe.git;a=commitdiff;h=93f30e00bd49b7a9a7c6c327e2e4820a2424ddf9
commit 93f30e00bd49b7a9a7c6c327e2e4820a2424ddf9
Author: crazy <cr...@frugalware.org>
Date: Wed Sep 13 01:56:45 2017 +0200
grub: new kernel new vbox issues :)
* fire up 16bit mode for now .. getting tired of all this vbox bugs
* options moved to submenu(s)
diff --git a/boot-files/grub-no-locales.cfg b/boot-files/grub-no-locales.cfg
index d8b2a23..4d4b79c 100644
--- a/boot-files/grub-no-locales.cfg
+++ b/boot-files/grub-no-locales.cfg
@@ -64,8 +64,8 @@ if [ "${grub_platform}" = "efi" ]; then
export LINUX
export INITRD
else
- set LINUX="linux"
- set INITRD="initrd"
+ set LINUX="linux16"
+ set INITRD="initrd16"
export LINUX
export INITRD
@@ -76,3 +76,17 @@ menuentry 'Frugalware Versatile Bootable Environment' {
$LINUX /boot/vmlinuz root=live:CDLABEL=FVBE rd.live.image
locale.LANG=${bootlang} vconsole.keymap=${bootkeymap} vconsole.font=ter-v16b
rd.luks=0 rd.lvm=0 rd.md=0 quiet systemd.show_status=1 audit=0 ${acpi_opt}
$INITRD /boot/initrd
}
+
+submenu 'Frugalware Versatile Bootable Environment Extra Options' {
+ menuentry 'Disable ACPI' {
+ set acpi_opt="noacpi acpi=off"
+ export acpi_opt
+ configfile /boot/grub/grub.cfg
+ }
+
+ menuentry 'Disable PCI ACPI only' {
+ set acpi_opt="pci=noacpi"
+ export acpi_opt
+ configfile /boot/grub/grub.cfg
+ }
+}
diff --git a/boot-files/grub.cfg b/boot-files/grub.cfg
index 568b87e..fffc7bf 100644
--- a/boot-files/grub.cfg
+++ b/boot-files/grub.cfg
@@ -64,8 +64,8 @@ if [ "${grub_platform}" = "efi" ]; then
export LINUX
export INITRD
else
- set LINUX="linux"
- set INITRD="initrd"
+ set LINUX="linux16"
+ set INITRD="initrd16"
export LINUX
export INITRD
@@ -77,18 +77,18 @@ menuentry 'Frugalware Versatile Bootable Environment' {
$INITRD /boot/initrd
}
+submenu 'Frugalware Versatile Bootable Environment Extra Options' {
+ menuentry 'Disable ACPI' {
+ set acpi_opt="noacpi acpi=off"
+ export acpi_opt
+ configfile /boot/grub/grub.cfg
+ }
-
-menuentry 'Disable ACPI..' {
- set acpi_opt="noacpi acpi=off"
- export acpi_opt
- configfile /boot/grub/grub.cfg
-}
-
-menuentry 'Disable PCI ACPI only..' {
- set acpi_opt="pci=noacpi"
- export acpi_opt
- configfile /boot/grub/grub.cfg
+ menuentry 'Disable PCI ACPI only' {
+ set acpi_opt="pci=noacpi"
+ export acpi_opt
+ configfile /boot/grub/grub.cfg
+ }
}
_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
