diff options
| author | Ben Wiederhake <BenWiederhake.GitHub@gmx.de> | 2021-10-23 17:31:00 +0200 |
|---|---|---|
| committer | Andreas Kling <kling@serenityos.org> | 2021-10-25 23:38:28 +0200 |
| commit | 09432a82412357421b2a1247001e4c919e954777 (patch) | |
| tree | 48f0b2baaefb661b94c0f70e92995932027e314f /Meta | |
| parent | 542a88a7be9fbdbc2ff3eadc38cdcaa33292fb97 (diff) | |
| download | serenity-09432a82412357421b2a1247001e4c919e954777.zip | |
Kernel: Separate panic behavior from bootmode
Bootmode used to control panic behavior and SystemServer.
This patch factors panic behavior control into a separate flag.
Diffstat (limited to 'Meta')
| -rw-r--r-- | Meta/Azure/Serenity.yml | 2 | ||||
| -rwxr-xr-x | Meta/serenity.sh | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/Meta/Azure/Serenity.yml b/Meta/Azure/Serenity.yml index a115f3e3dc..e2bc903a5b 100644 --- a/Meta/Azure/Serenity.yml +++ b/Meta/Azure/Serenity.yml @@ -80,7 +80,7 @@ jobs: timeoutInMinutes: 60 env: SERENITY_QEMU_CPU: 'max,vmx=off' - SERENITY_KERNEL_CMDLINE: 'fbdev=off boot_mode=self-test' + SERENITY_KERNEL_CMDLINE: 'fbdev=off panic=shutdown boot_mode=self-test' SERENITY_RUN: 'ci' - script: | diff --git a/Meta/serenity.sh b/Meta/serenity.sh index 46bd9f54d9..a5218b343c 100755 --- a/Meta/serenity.sh +++ b/Meta/serenity.sh @@ -358,6 +358,8 @@ if [[ "$CMD" =~ ^(build|install|image|copy-src|run|gdb|test|rebuild|recreate|kad else build_target install build_target image + # In contrast to CI, we don't set 'panic=shutdown' here, + # in case the user wants to inspect qemu some more. export SERENITY_KERNEL_CMDLINE="fbdev=off boot_mode=self-test" export SERENITY_RUN="ci" build_target run |