chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
core: introduce new Restart=on-abnormal setting
[elogind.git]
/
man
/
systemd-nspawn.xml
diff --git
a/man/systemd-nspawn.xml
b/man/systemd-nspawn.xml
index 18946167c559d07bce7d321c5c87f6062679e44c..ccd3436d424869b0b4d7cd610a0d0d19b15184ea 100644
(file)
--- a/
man/systemd-nspawn.xml
+++ b/
man/systemd-nspawn.xml
@@
-340,7
+340,7
@@
container's name (as specified with
<option>--machine=</option>), prefixed
with <literal>ve-</literal>. The
container's name (as specified with
<option>--machine=</option>), prefixed
with <literal>ve-</literal>. The
- container side of the
the
Ethernet
+ container side of the Ethernet
link will be named
<literal>host0</literal>. Note that
<option>--network-veth</option>
link will be named
<literal>host0</literal>. Note that
<option>--network-veth</option>
@@
-358,7
+358,7
@@
<option>--network-bridge=</option>
implies
<option>--network-veth</option>. If
<option>--network-bridge=</option>
implies
<option>--network-veth</option>. If
- this option is used the host side of
+ this option is used
,
the host side of
the Ethernet link will use the
<literal>vb-</literal> prefix instead
of <literal>ve-</literal>.</para></listitem>
the Ethernet link will use the
<literal>vb-</literal> prefix instead
of <literal>ve-</literal>.</para></listitem>
@@
-601,7
+601,7
@@
<literal>x86-64</literal> are
supported. This is useful when running
a 32-bit container on a 64-bit
<literal>x86-64</literal> are
supported. This is useful when running
a 32-bit container on a 64-bit
- host. If this setting is not used
+ host. If this setting is not used
,
the personality reported in the
container is the same as the one
reported on the
the personality reported in the
container is the same as the one
reported on the