Skip to content

Commit

Permalink
man: improve sysroot.readonly docs
Browse files Browse the repository at this point in the history
The explanation of sysroot.readonly is a little confusing - we say
that "everything else is mounted read-only" but it's perhaps clearer
to say /sysroot is mounted read-only.

Also note that read-only is the default with composefs.

Finally, document the option in ostree.repo-config even though it is
now considered legacy - as of commit 22b8e4f (ostreedev#2930) - it is still
commonly seen in repo configs, so users will look to understand
what it means.
  • Loading branch information
markmc committed Nov 24, 2023
1 parent cd1728a commit 2cfa8ab
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 4 deletions.
8 changes: 4 additions & 4 deletions man/ostree-prepare-root.xml
Original file line number Diff line number Diff line change
Expand Up @@ -85,10 +85,10 @@ License along with this library. If not, see <https://www.gnu.org/licenses/>.
</para>

<para>
A read-only bind mount is created over <literal>/sysroot/usr</literal>. The immutable bit is set on the deployment
A read-only bind mount is created over <literal>/sysroot/usr</literal>. The immutable bit (see chattr(1)) is set on the deployment
root, so this provides basic protection for filesystem mutation. If the <literal>sysroot.readonly</literal>
option is enabled, instead a writable bind mount for <literal>/sysroot/etc</literal>, and everything else
is mounted read-only.
option is enabled, then <literal>/sysroot/sysroot</literal> is mounted read-only to provide further protection and a writable bind mount for
<literal>/sysroot/etc</literal> is created.
</para>

<para>
Expand All @@ -111,7 +111,7 @@ License along with this library. If not, see <https://www.gnu.org/licenses/>.
<variablelist>
<varlistentry>
<term><varname>sysroot.readonly</varname></term>
<listitem><para>A boolean value; the default is <literal>false</literal>. If this is set to <literal>true</literal>, then the <literal>/sysroot</literal> mount point is mounted read-only.</para></listitem>
<listitem><para>A boolean value; the default is <literal>false</literal> unless composefs is enabled. If this is set to <literal>true</literal>, then the <literal>/sysroot</literal> mount point is mounted read-only.</para></listitem>
</varlistentry>
<varlistentry>
<term><varname>etc.transient</varname></term>
Expand Down
9 changes: 9 additions & 0 deletions man/ostree.repo-config.xml
Original file line number Diff line number Diff line change
Expand Up @@ -378,6 +378,15 @@ License along with this library. If not, see <https://www.gnu.org/licenses/>.

<variablelist>

<varlistentry>
<term><varname>readonly</varname></term>
<listitem><para>A boolean value. If this is set to <literal>true</literal>, then the
<literal>/sysroot</literal> mount point is mounted read-only. This is configured a
legacy repository configuration and the equivalent option in <literal>ostree/prepare-root.conf</literal>
should be used instead - see <citerefentry><refentrytitle>ostree-prepare-root</refentrytitle><manvolnum>1</manvolnum></citerefentry>.
</para></listitem>
</varlistentry>

<varlistentry>
<term><varname>bootloader</varname></term>
<listitem><para>Configure the bootloader that OSTree uses when
Expand Down

0 comments on commit 2cfa8ab

Please sign in to comment.