diff options
| author | Ben Wiederhake <BenWiederhake.GitHub@gmx.de> | 2021-10-23 17:18:57 +0200 |
|---|---|---|
| committer | Andreas Kling <kling@serenityos.org> | 2021-10-25 23:38:28 +0200 |
| commit | 542a88a7be9fbdbc2ff3eadc38cdcaa33292fb97 (patch) | |
| tree | 07f15023e4b8546c809f677a8b01b3006e7ea22b /Documentation | |
| parent | 314b8a374ba82152bb092d9c6ff0c2b5d5c21005 (diff) | |
| download | serenity-542a88a7be9fbdbc2ff3eadc38cdcaa33292fb97.zip | |
Kernel: Separate framebuffers from bootmode
Bootmode used to control framebuffers, panic behavior, and SystemServer.
This patch factors framebuffer control into a separate flag.
Note that the combination 'bootmode=self-test fbdev=on' leads to
unexpected behavior, which can only be fixed in a later commit.
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/BareMetalInstallation.md | 2 | ||||
| -rw-r--r-- | Documentation/NetworkBoot.md | 4 | ||||
| -rw-r--r-- | Documentation/RunningTests.md | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/Documentation/BareMetalInstallation.md b/Documentation/BareMetalInstallation.md index f662bcf803..9ca9ff7a58 100644 --- a/Documentation/BareMetalInstallation.md +++ b/Documentation/BareMetalInstallation.md @@ -56,5 +56,5 @@ framebuffer with 8x8 font glyphs. You can force capable multiboot bootloaders to boot Serenity into high resolution mode by editing **Kernel/Arch/i386/Boot/boot.S** and adding **| MULTIBOOT_VIDEO_MODE** to the end of the **multiboot_flags** before building Serenity. -Setting a boot argument of `boot_mode=no-fbdev` will force the kernel to not initialize any framebuffer devices, hence allowing the system +Setting a boot argument of `fbdev=off` will force the kernel to not initialize any framebuffer devices, hence allowing the system to boot into console-only mode as `SystemServer` will detect this condition and will not initialize `WindowServer`. diff --git a/Documentation/NetworkBoot.md b/Documentation/NetworkBoot.md index a2776f36ea..f8506adcf4 100644 --- a/Documentation/NetworkBoot.md +++ b/Documentation/NetworkBoot.md @@ -87,7 +87,7 @@ menuentry 'SerenityOS - netboot diskless text mode' { set gfxkeep=text terminal_output console echo 'Loading prekernel...' - multiboot (tftp)/serenity/prekernel root=/dev/ramdisk0 boot_mode=text + multiboot (tftp)/serenity/prekernel root=/dev/ramdisk0 fbdev=off echo 'Loading kernel...' module (tftp)/serenity/kernel echo 'Loading ramdisk...' @@ -179,7 +179,7 @@ For troubleshooting purposes, you can add the following command line arguments i - `disable_uhci_controller` Because iPXE (unlike GRUB) doesn't support VESA VBE modesetting when booting a multiboot kernel, -you might not see any output, so add the `boot_mode=text` argument as well to boot into VGA text mode. +you might not see any output, so add the `fbdev=off` argument as well to boot into VGA text mode. Afterwards you will need to enable the `console` iPXE command by uncommenting the following line in `src/config/general.h`: ```c diff --git a/Documentation/RunningTests.md b/Documentation/RunningTests.md index 9aeea0529c..01d7aa058e 100644 --- a/Documentation/RunningTests.md +++ b/Documentation/RunningTests.md @@ -114,6 +114,6 @@ lines will boot SerenityOS in self-test mode, run tests, and exit. ```sh export SERENITY_RUN=ci -export SERENITY_KERNEL_CMDLINE="boot_mode=self-test" +export SERENITY_KERNEL_CMDLINE="fbdev=off boot_mode=self-test" ninja run ``` |