diff --git a/docs/src/bootc-install.md b/docs/src/bootc-install.md index 053c797f..85c58a3d 100644 --- a/docs/src/bootc-install.md +++ b/docs/src/bootc-install.md @@ -70,7 +70,7 @@ the host's block device where `` will be installed on. The `--pid=host --security-opt label=type:unconfined_t` today make it more convenient for bootc to perform some privileged -operations; in the future these requirement may be dropped. +operations; in the future these requirements may be dropped. The `-v /var/lib/containers:/var/lib/containers` option is required in order for the container to access its own underlying image, which is used by @@ -147,7 +147,7 @@ can be configured off at build time via Cargo features. The usual expected way for an external storage system to work is to provide `root=` and `rootflags` kernel arguments -to describe to the inital RAM disk how to find and mount the +to describe to the initial RAM disk how to find and mount the root partition. For more on this, see the below section discussing mounting the root filesystem. @@ -280,7 +280,7 @@ in `/etc/fstab`. The physical root is mounted at `/sysroot`. It is an option for legacy `/etc/fstab` references for `/` to use -`/sysroot` by default, but `rootflags` is prefered. +`/sysroot` by default, but `rootflags` is preferred. ## Configuring machine-local state diff --git a/docs/src/filesystem.md b/docs/src/filesystem.md index e4143a37..ccbeabc8 100644 --- a/docs/src/filesystem.md +++ b/docs/src/filesystem.md @@ -70,7 +70,7 @@ in derived builds. ## `/etc` The `/etc` directory contains mutable persistent state by default; however, -it is suppported (and encouraged) to enable the [`etc.transient` config option](https://ostreedev.github.io/ostree/man/ostree-prepare-root.html), +it is supported (and encouraged) to enable the [`etc.transient` config option](https://ostreedev.github.io/ostree/man/ostree-prepare-root.html), see below as well. When in persistent mode, it inherits the OSTree semantics of [performing a 3-way merge](https://ostreedev.github.io/ostree/atomic-upgrades/#assembling-a-new-deployment-directory) @@ -81,7 +81,7 @@ across upgrades. In a nutshell: - Locally modified files in `/etc` different from the default `/usr/etc` (of the same deployment) will be retained You can view the state via `ostree admin config-diff`. Note that the "diff" -here is includes metadata (uid, gid, extended attributes), so changing any of those +here includes metadata (uid, gid, extended attributes), so changing any of those will also mean that updated files from the image are not applied. The implementation of this defaults to being executed by `ostree-finalize-staged.service` @@ -92,7 +92,7 @@ default configuration files in `/etc`. And even if the default package doesn't, only looks for config files there by default. Some other image-based update systems do not have distinct "versions" of `/etc` and -it may be populated only set up at a install time, and untouched thereafter. But +it may be populated only set up at install time, and untouched thereafter. But that creates "hysteresis" where the state of the system's `/etc` is strongly influenced by the initial image version. This can lead to problems where e.g. a change to `/etc/sudoers.conf` (to give on simple example) diff --git a/lib/src/lsm.rs b/lib/src/lsm.rs index b7faad38..a3b76482 100644 --- a/lib/src/lsm.rs +++ b/lib/src/lsm.rs @@ -251,7 +251,7 @@ pub(crate) fn has_security_selinux(root: &Dir, path: &Utf8Path) -> Result