system/systemd
system/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd synced 2024-07-21 10:17:21 +00:00
Code Issues Actions 7 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 17:32:28 +02:00 committed by Luca Boccassi
parent bf07a12516
commit abd6faae80
2 changed files with 6 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
man/systemd.journal-fields.xml
View file

@ -399,12 +399,12 @@
</listitem>
</varlistentry>
<varlistentry>
<term><varname>_SYSTEM_CONTEXT=</varname></term>
<term><varname>_RUNTIME_SCOPE=</varname></term>
<listitem><para>A string field that specifies the context in which the message was logged. If
<literal>initrd</literal>, the log message was processed while systemd-journald
was running inside the initrd. If <literal>main</literal>, the log message was generated after
journald switched root to the root filesystem.</para></listitem>
<listitem><para>A string field that specifies the runtime scope in which the message was logged. If
<literal>initrd</literal>, the log message was processed while the system was running inside the
initial RAM disk (initrd). If <literal>system</literal>, the log message was generated after the
system switched execution to the host root filesystem.</para></listitem>
</varlistentry>
</variablelist>
</refsect1>

6
src/journal/journald-server.c
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))