Skip to content

Commit

Permalink
Merge pull request #23349 from eliasp/doc-typo
Browse files Browse the repository at this point in the history
Fix typo in docs/BUILDING_IMAGES.md, format `PID 1` consistently in docs/
  • Loading branch information
bluca committed May 11, 2022
2 parents 1f066ce + 8f1a581 commit 67b1e9d
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion docs/BUILDING_IMAGES.md
Expand Up @@ -101,7 +101,7 @@ on first boot as needed.

Specifically, the following mechanisms are in place:

1. The `swich-root` logic in systemd, that is used to switch from the initrd
1. The `switch-root` logic in systemd, that is used to switch from the initrd
phase to the host will create the basic OS hierarchy skeleton if missing. It
will create a couple of directories strictly necessary to boot up
successfully, plus essential symlinks (such as those necessary for the
Expand Down
4 changes: 2 additions & 2 deletions docs/CONTAINER_INTERFACE.md
Expand Up @@ -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`,
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion docs/ENVIRONMENT.md
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion docs/HACKING.md
Expand Up @@ -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
Expand Down

0 comments on commit 67b1e9d

Please sign in to comment.