SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

journal: rename special journal field _SYSTEM_CONTEXT= → _RUNTIME_SCOPE=

Browse Source 
Previously the field "_SYSTEM_CONTEXT" knew he values "initrd" + "main". Let's change
this to "_RUNTIME_SCOPE" and "initrd" + "system".

Why? The sysext logic has a very similar concept of "scopes", declaring
whether a sysext image is intended for the initrd or the main system.
Let's thus use the same naming for both.

sysext's extension-release files hence know SYSEXT_SCOPE=initrd|system,
and the journal messages know _RUNTIME_SCOPE=initrd|system, which makes
this reasonably systematic.

Follow-up for: cae8edd93c

(This is not an API break, since no version with this commit has ever
been released.)
This commit is contained in:
Lennart Poettering
2022-08-25 22:27:26 +01:00
committed by Luca Boccassi
parent bf07a12516
commit abd6faae80
2 changed files with 6 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/journal/journald-server.c
+1 -5
View File
@@ -1035,11 +1035,7 @@ static void dispatch_message_real(
if (!isempty(s->namespace_field))
iovec[n++] = IOVEC_MAKE_STRING(s->namespace_field);
if (in_initrd())
iovec[n++] = IOVEC_MAKE_STRING("_SYSTEM_CONTEXT=initrd");
else
iovec[n++] = IOVEC_MAKE_STRING("_SYSTEM_CONTEXT=main");
iovec[n++] = in_initrd() ? IOVEC_MAKE_STRING("_RUNTIME_SCOPE=initrd") : IOVEC_MAKE_STRING("_RUNTIME_SCOPE=system");
assert(n <= m);
if (s->split_mode == SPLIT_UID && c && uid_is_valid(c->uid))