Skip to content

Commit 3797fd0

Browse files
committed
man: break long lines and update Fedora versions
We should try to keep the unbreakable lines below 80 columns. It's not always possible of course. Also, use the dl.fp.o alias instead of a specific mirror.
1 parent 52a4aaf commit 3797fd0

File tree

1 file changed

+14
-7
lines changed

1 file changed

+14
-7
lines changed

man/systemd-nspawn.xml

Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -346,8 +346,9 @@
346346
in the container's file system namespace.</para>
347347

348348
<para>This is for containers which have several bootable directories in them; for example, several
349-
<ulink url="https://ostree.readthedocs.io/en/latest/">OSTree</ulink> deployments. It emulates the behavior of the boot
350-
loader and initial RAM disk which normally select which directory to mount as root and start the container's PID 1 in.</para></listitem>
349+
<ulink url="https://ostree.readthedocs.io/en/latest/">OSTree</ulink> deployments. It emulates the behavior of
350+
the boot loader and initial RAM disk which normally select which directory to mount as the root and start the
351+
container's PID 1 in.</para></listitem>
351352
</varlistentry>
352353

353354
<varlistentry>
@@ -1041,8 +1042,9 @@
10411042
<example>
10421043
<title>Download a Fedora image and start a shell in it</title>
10431044

1044-
<programlisting># machinectl pull-raw --verify=no http://ftp.halifax.rwth-aachen.de/fedora/linux/releases/24/CloudImages/x86_64/images/Fedora-Cloud-Base-24-1.2.x86_64.raw.xz
1045-
# systemd-nspawn -M Fedora-Cloud-Base-24-1.2.x86_64.raw</programlisting>
1045+
<programlisting># machinectl pull-raw --verify=no \
1046+
https://download.fedoraproject.org/pub/fedora/linux/releases/25/CloudImages/x86_64/images/Fedora-Cloud-Base-25-1.3.x86_64.raw.xz
1047+
# systemd-nspawn -M Fedora-Cloud-Base-25-1.3.x86_64.raw</programlisting>
10461048

10471049
<para>This downloads an image using
10481050
<citerefentry><refentrytitle>machinectl</refentrytitle><manvolnum>1</manvolnum></citerefentry>
@@ -1052,7 +1054,9 @@
10521054
<example>
10531055
<title>Build and boot a minimal Fedora distribution in a container</title>
10541056

1055-
<programlisting># dnf -y --releasever=23 --installroot=/srv/mycontainer --disablerepo='*' --enablerepo=fedora --enablerepo=updates install systemd passwd dnf fedora-release vim-minimal
1057+
<programlisting># dnf -y --releasever=25 --installroot=/srv/mycontainer \
1058+
--disablerepo='*' --enablerepo=fedora --enablerepo=updates install \
1059+
systemd passwd dnf fedora-release vim-minimal
10561060
# systemd-nspawn -bD /srv/mycontainer</programlisting>
10571061

10581062
<para>This installs a minimal Fedora distribution into the
@@ -1095,13 +1099,16 @@
10951099
<title>Run a container with SELinux sandbox security contexts</title>
10961100

10971101
<programlisting># chcon system_u:object_r:svirt_sandbox_file_t:s0:c0,c1 -R /srv/container
1098-
# systemd-nspawn -L system_u:object_r:svirt_sandbox_file_t:s0:c0,c1 -Z system_u:system_r:svirt_lxc_net_t:s0:c0,c1 -D /srv/container /bin/sh</programlisting>
1102+
# systemd-nspawn -L system_u:object_r:svirt_sandbox_file_t:s0:c0,c1 \
1103+
-Z system_u:system_r:svirt_lxc_net_t:s0:c0,c1 -D /srv/container /bin/sh</programlisting>
10991104
</example>
11001105

11011106
<example>
11021107
<title>Run a container with an OSTree deployment</title>
11031108

1104-
<programlisting># systemd-nspawn -b -i ~/image.raw --pivot-root=/ostree/deploy/$OS/deploy/$CHECKSUM:/sysroot --bind=+/sysroot/ostree/deploy/$OS/var:/var</programlisting>
1109+
<programlisting># systemd-nspawn -b -i ~/image.raw \
1110+
--pivot-root=/ostree/deploy/$OS/deploy/$CHECKSUM:/sysroot \
1111+
--bind=+/sysroot/ostree/deploy/$OS/var:/var</programlisting>
11051112
</example>
11061113
</refsect1>
11071114

0 commit comments

Comments
 (0)