diff options
| author | etaIneLp <33374857+etaIneLp@users.noreply.github.com> | 2020-05-27 10:36:14 -0400 |
|---|---|---|
| committer | Andreas Kling <kling@serenityos.org> | 2020-05-28 00:50:55 +0200 |
| commit | 7bc871ca8dd851605bfd67cb5be1538d009aa56b (patch) | |
| tree | 26e7af8afdfd69ef1a7c6e1aad1927fa25349783 /Meta | |
| parent | eae4843712a87fdbfe2c5aba94c3f3e304935277 (diff) | |
| download | serenity-7bc871ca8dd851605bfd67cb5be1538d009aa56b.zip | |
Kernel: Stop bootloader from setting video mode with Multiboot
Meta: Update INSTALL.md and grub configs for new boot_mode option
Diffstat (limited to 'Meta')
| -rw-r--r-- | Meta/grub-ebr.cfg | 5 | ||||
| -rw-r--r-- | Meta/grub-gpt.cfg | 5 | ||||
| -rw-r--r-- | Meta/grub-mbr.cfg | 7 |
3 files changed, 16 insertions, 1 deletions
diff --git a/Meta/grub-ebr.cfg b/Meta/grub-ebr.cfg index 2b351ce72f..f865bb9162 100644 --- a/Meta/grub-ebr.cfg +++ b/Meta/grub-ebr.cfg @@ -5,6 +5,11 @@ menuentry 'SerenityOS (normal)' { multiboot /boot/Kernel root=/dev/hda5 } +menuentry 'SerenityOS (text mode)' { + root=hd0,5 + multiboot /boot/Kernel boot_mode=text root=/dev/hda5 +} + menuentry 'SerenityOS (No ACPI)' { root=hd0,5 multiboot /boot/Kernel root=/dev/hda5 acpi=off diff --git a/Meta/grub-gpt.cfg b/Meta/grub-gpt.cfg index 9de1494daa..13addb2ab8 100644 --- a/Meta/grub-gpt.cfg +++ b/Meta/grub-gpt.cfg @@ -5,6 +5,11 @@ menuentry 'SerenityOS (normal)' { multiboot /boot/Kernel root=/dev/hda2 } +menuentry 'SerenityOS (text mode)' { + root=hd0,2 + multiboot /boot/Kernel boot_mode=text root=/dev/hda2 +} + menuentry 'SerenityOS (No ACPI)' { root=hd0,2 multiboot /boot/Kernel root=/dev/hda2 acpi=off diff --git a/Meta/grub-mbr.cfg b/Meta/grub-mbr.cfg index bbb37ffc66..f5cbf252bc 100644 --- a/Meta/grub-mbr.cfg +++ b/Meta/grub-mbr.cfg @@ -5,12 +5,17 @@ menuentry 'SerenityOS (normal)' { multiboot /boot/Kernel root=/dev/hda1 } +menuentry 'SerenityOS (text mode)' { + root=hd0,1 + multiboot /boot/Kernel boot_mode=text root=/dev/hda1 +} + menuentry 'SerenityOS (No ACPI)' { root=hd0,1 multiboot /boot/Kernel root=/dev/hda1 acpi=off } menuentry 'SerenityOS (with serial debug)' { - root=hd0,1 + root=hd0,1 multiboot /boot/Kernel serial_debug root=/dev/hda1 } |