From 8f1a581e0de48fa2707ee289eab3c75df2b08c0e Mon Sep 17 00:00:00 2001 From: Elias Probst Date: Wed, 11 May 2022 15:31:07 +0200 Subject: [PATCH] Use consistent formatting for `PID 1` across `docs/` --- docs/CONTAINER_INTERFACE.md | 4 ++-- docs/ENVIRONMENT.md | 2 +- docs/HACKING.md | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/docs/CONTAINER_INTERFACE.md b/docs/CONTAINER_INTERFACE.md index 757207ce94a..9b3e0e56ec8 100644 --- a/docs/CONTAINER_INTERFACE.md +++ b/docs/CONTAINER_INTERFACE.md @@ -38,7 +38,7 @@ manager, please consider supporting the following interfaces. 3. Pre-mount `/dev/` as (container private) `tmpfs` for the container and bind mount some suitable TTY to `/dev/console`. If this is a pty, make sure to - not close the controlling pty during systemd's lifetime. PID1 will close + not close the controlling pty during systemd's lifetime. PID 1 will close ttys, to avoid being killed by SAK. It only opens ttys for the time it actually needs to print something. Also, make sure to create device nodes for `/dev/null`, `/dev/zero`, `/dev/full`, `/dev/random`, `/dev/urandom`, @@ -263,7 +263,7 @@ care should be taken to avoid naming conflicts. `systemd` (and in particular short string identifying the container manager implementation. This file should be newline terminated. Passing this information via this file has the benefit that payload code can easily access it, even when running - unprivileged without access to the container PID1's environment block. + unprivileged without access to the container PID 1's environment block. 6. The `/run/host/container-uuid` file may be used to pass the same information as the `$container_uuid` environment variable (see above). This file should diff --git a/docs/ENVIRONMENT.md b/docs/ENVIRONMENT.md index 257874d95c0..711e14a7c56 100644 --- a/docs/ENVIRONMENT.md +++ b/docs/ENVIRONMENT.md @@ -111,7 +111,7 @@ All tools: `systemctl`: -* `$SYSTEMCTL_FORCE_BUS=1` — if set, do not connect to PID1's private D-Bus +* `$SYSTEMCTL_FORCE_BUS=1` — if set, do not connect to PID 1's private D-Bus listener, and instead always connect through the dbus-daemon D-bus broker. * `$SYSTEMCTL_INSTALL_CLIENT_SIDE=1` — if set, enable or disable unit files on diff --git a/docs/HACKING.md b/docs/HACKING.md index f6b42297e0c..3f6838cfd06 100644 --- a/docs/HACKING.md +++ b/docs/HACKING.md @@ -30,7 +30,7 @@ Please always test your work before submitting a PR. For many of the components of systemd testing is straightforward as you can simply compile systemd and run the relevant tool from the build directory. -For some components (most importantly, systemd/PID1 itself) this is not +For some components (most importantly, systemd/PID 1 itself) this is not possible, however. In order to simplify testing for cases like this we provide a set of `mkosi` build files directly in the source tree. [mkosi](https://github.com/systemd/mkosi) is a tool for building clean OS images -- 2.47.3