chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
man: clearify the meaning of timeout=0 for password agents
[elogind.git]
/
man
/
systemd-nspawn.xml
diff --git
a/man/systemd-nspawn.xml
b/man/systemd-nspawn.xml
index db2d417e49f83110d31a25ab741fdedb93668970..777e0a3a77ba0ead624e29111ade46477892c9da 100644
(file)
--- a/
man/systemd-nspawn.xml
+++ b/
man/systemd-nspawn.xml
@@
-227,8
+227,8
@@
list of capability names, see
<citerefentry><refentrytitle>capabilities</refentrytitle><manvolnum>7</manvolnum></citerefentry>
for more information. Note that the
list of capability names, see
<citerefentry><refentrytitle>capabilities</refentrytitle><manvolnum>7</manvolnum></citerefentry>
for more information. Note that the
- following capabilities will be
-
granted
in any way: CAP_CHOWN,
+ following capabilities will be
granted
+ in any way: CAP_CHOWN,
CAP_DAC_OVERRIDE, CAP_DAC_READ_SEARCH,
CAP_FOWNER, CAP_FSETID, CAP_IPC_OWNER,
CAP_KILL, CAP_LEASE,
CAP_DAC_OVERRIDE, CAP_DAC_READ_SEARCH,
CAP_FOWNER, CAP_FSETID, CAP_IPC_OWNER,
CAP_KILL, CAP_LEASE,
@@
-239,7
+239,9
@@
CAP_SETUID, CAP_SYS_ADMIN,
CAP_SYS_CHROOT, CAP_SYS_NICE,
CAP_SYS_PTRACE, CAP_SYS_TTY_CONFIG,
CAP_SETUID, CAP_SYS_ADMIN,
CAP_SYS_CHROOT, CAP_SYS_NICE,
CAP_SYS_PTRACE, CAP_SYS_TTY_CONFIG,
- CAP_SYS_RESOURCE, CAP_SYS_BOOT.</para></listitem>
+ CAP_SYS_RESOURCE, CAP_SYS_BOOT,
+ CAP_AUDIT_WRITE,
+ CAP_AUDIT_CONTROL.</para></listitem>
</varlistentry>
<varlistentry>
</varlistentry>
<varlistentry>
@@
-296,13
+298,13
@@
<refsect1>
<title>Example 1</title>
<refsect1>
<title>Example 1</title>
- <programlisting># yum -
-releasever=17 --nogpgcheck --installroot ~/fedora-tree/ install yum passwd vim-minimal rootfiles systemd
-# systemd-nspawn -
D ~/fedora-tree /usr/lib/systemd/systemd
</programlisting>
+ <programlisting># yum -
y --releasever=19 --nogpg --installroot=/srv/mycontainer --disablerepo='*' --enablerepo=fedora install systemd passwd yum fedora-release vim-minimal
+# systemd-nspawn -
bD /srv/mycontainer
</programlisting>
<para>This installs a minimal Fedora distribution into
<para>This installs a minimal Fedora distribution into
- the directory <filename>
~/fedora-tree/</filename>
- and then boots an OS in a namespace container in it,
-
with systemd as init system
.</para>
+ the directory <filename>
/srv/mycontainer/</filename> and
+ then boots an OS in a namespace container in
+
it
.</para>
</refsect1>
<refsect1>
</refsect1>
<refsect1>