diff options
| author | Ben Wiederhake <BenWiederhake.GitHub@gmx.de> | 2021-10-23 18:26:50 +0200 |
|---|---|---|
| committer | Andreas Kling <kling@serenityos.org> | 2021-10-25 23:38:28 +0200 |
| commit | 8d13f6ddce54deca5ed9bff9af2a4d31bb290121 (patch) | |
| tree | ee400910bcbe04621c5bf561a0933536bfefd48f /Meta | |
| parent | 09432a82412357421b2a1247001e4c919e954777 (diff) | |
| download | serenity-8d13f6ddce54deca5ed9bff9af2a4d31bb290121.zip | |
Kernel+SystemServer: Change bootmode to system_mode
'bootmode' now only controls which set of services are started by
SystemServer, so it is more appropriate to rename it to system_mode, and
no longer validate it in the Kernel.
Diffstat (limited to 'Meta')
| -rw-r--r-- | Meta/Azure/Serenity.yml | 2 | ||||
| -rwxr-xr-x | Meta/serenity.sh | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/Meta/Azure/Serenity.yml b/Meta/Azure/Serenity.yml index e2bc903a5b..0f395cafcb 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 panic=shutdown boot_mode=self-test' + SERENITY_KERNEL_CMDLINE: 'fbdev=off panic=shutdown system_mode=self-test' SERENITY_RUN: 'ci' - script: | diff --git a/Meta/serenity.sh b/Meta/serenity.sh index a5218b343c..84318a34ca 100755 --- a/Meta/serenity.sh +++ b/Meta/serenity.sh @@ -30,7 +30,7 @@ Usage: $NAME COMMAND [TARGET] [TOOLCHAIN] [ARGS...] is specified tests matching it. All other TARGETs: $NAME test [TARGET] Runs the built image in QEMU in self-test mode, by passing - boot_mode=self-test to the Kernel + system_mode=self-test to the Kernel delete: Removes the build environment for TARGET recreate: Deletes and re-creates the build environment for TARGET rebuild: Deletes and re-creates the build environment, and compiles for TARGET @@ -360,7 +360,7 @@ if [[ "$CMD" =~ ^(build|install|image|copy-src|run|gdb|test|rebuild|recreate|kad 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_KERNEL_CMDLINE="fbdev=off system_mode=self-test" export SERENITY_RUN="ci" build_target run fi |