diff options
| author | Lennart Poettering <lennart@poettering.net> | 2018-05-16 23:43:03 -0400 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2018-05-22 16:21:26 +0200 |
| commit | 1688841f4628f4e55ad31e769da3a712474bf995 (patch) | |
| tree | 6f8d87e81ffad06ecf4622212e3ea215513c43e5 /man | |
| parent | 63d1c29ffabd737ec6eecc3a5552d279044cd0a1 (diff) | |
| download | systemd-1688841f4628f4e55ad31e769da3a712474bf995.tar.gz systemd-1688841f4628f4e55ad31e769da3a712474bf995.tar.bz2 systemd-1688841f4628f4e55ad31e769da3a712474bf995.zip | |
nspawn: similar to the previous patches, also make /etc/localtime handling more configurable
Fixes: #9009
Diffstat (limited to 'man')
| -rw-r--r-- | man/systemd-nspawn.xml | 19 | ||||
| -rw-r--r-- | man/systemd.nspawn.xml | 9 |
2 files changed, 28 insertions, 0 deletions
diff --git a/man/systemd-nspawn.xml b/man/systemd-nspawn.xml index 03e79683bc..1c8c6c8e60 100644 --- a/man/systemd-nspawn.xml +++ b/man/systemd-nspawn.xml @@ -888,6 +888,25 @@ </varlistentry> <varlistentry> + <term><option>--timezone=</option></term> + + <listitem><para>Configures how <filename>/etc/localtime</filename> inside of the container (i.e. local timezone + synchronization from host to container) shall be handled. Takes one of <literal>off</literal>, + <literal>copy</literal>, <literal>bind</literal>, <literal>symlink</literal>, <literal>delete</literal> or + <literal>auto</literal>. If set to <literal>off</literal> the <filename>/etc/localtime</filename> file in the + container is left as it is included in the image, and neither modified nor bind mounted over. If set to + <literal>copy</literal> the <filename>/etc/localtime</filename> file of the host is copied into the + container. Similar, if <literal>bind</literal> is used, it is bind mounted from the host into the container. If + set to <literal>symlink</literal> a symlink from <filename>/etc/localtime</filename> in the container is + created pointing to the matching the timezone file of the container that matches the timezone setting on the + host. If set to <literal>delete</literal> the file in the container is deleted, should it exist. If set to + <literal>auto</literal> and the <filename>/etc/localtime</filename> file of the host is a symlink, then + <literal>symlink</literal> mode is used, and <literal>copy</literal> otherwise, except if the image is + read-only in which case <literal>bind</literal> is used instead. Defaults to + <literal>auto</literal>.</para></listitem> + </varlistentry> + + <varlistentry> <term><option>--read-only</option></term> <listitem><para>Mount the root file system read-only for the diff --git a/man/systemd.nspawn.xml b/man/systemd.nspawn.xml index 3484d5cac6..275f96ca13 100644 --- a/man/systemd.nspawn.xml +++ b/man/systemd.nspawn.xml @@ -350,6 +350,15 @@ </varlistentry> <varlistentry> + <term><varname>Timezone=</varname></term> + + <listitem><para>Configures how <filename>/etc/localtime</filename> in the container shall be handled. This is + equivalent to the <option>--localtime=</option> command line switch, and takes the same argument. See + <citerefentry><refentrytitle>systemd-nspawn</refentrytitle><manvolnum>1</manvolnum></citerefentry> for + details.</para></listitem> + </varlistentry> + + <varlistentry> <term><varname>LinkJournal=</varname></term> <listitem><para>Configures how to link host and container journal setups. This is equivalent to the |