summaryrefslogtreecommitdiff
path: root/man
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2020-06-03 19:00:04 +0200
committerGitHub <noreply@github.com>2020-06-03 19:00:04 +0200
commit0d63e7dd0bff07204cf35ed07e56270a03a6055f (patch)
treeea693230f7ec7bc7c827af4bc5b64d8634b6a094 /man
parentecc04067f9892f6d4f7c300c34de9e2f87813ef2 (diff)
parent927b9b8f63c2c8b1e56ffd127bf5366c02b2aa0f (diff)
downloadsystemd-0d63e7dd0bff07204cf35ed07e56270a03a6055f.tar.gz
Merge pull request #16056 from keszybz/minor-doc-updates
Minor doc updates
Diffstat (limited to 'man')
-rw-r--r--man/systemd-nspawn.xml4
-rw-r--r--man/systemd.special.xml19
2 files changed, 13 insertions, 10 deletions
diff --git a/man/systemd-nspawn.xml b/man/systemd-nspawn.xml
index 8c7d5a2004..f9cc5a8828 100644
--- a/man/systemd-nspawn.xml
+++ b/man/systemd-nspawn.xml
@@ -1,8 +1,8 @@
<?xml version='1.0'?>
<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [
-<!ENTITY fedora_latest_version "31">
-<!ENTITY fedora_cloud_release "1.9">
+<!ENTITY fedora_latest_version "32">
+<!ENTITY fedora_cloud_release "1.6">
]>
<!-- SPDX-License-Identifier: LGPL-2.1+ -->
diff --git a/man/systemd.special.xml b/man/systemd.special.xml
index 8cd4c15f28..9f368f903d 100644
--- a/man/systemd.special.xml
+++ b/man/systemd.special.xml
@@ -228,22 +228,25 @@
<term><filename>emergency.target</filename></term>
<listitem>
<para>A special target unit that starts an emergency shell on the main console. This
- target does not pull in any services or mounts. It is the most minimal version of
+ target does not pull in other services or mounts. It is the most minimal version of
starting the system in order to acquire an interactive shell; the only processes running
- are usually just the system manager (PID 1) and the shell process. This unit is supposed
- to be used with the kernel command line option <varname>systemd.unit=</varname>; it is
- also used when a file system check on a required file system fails, and boot-up cannot
+ are usually just the system manager (PID 1) and the shell process. This unit may be used
+ by specifying <varname>emergency</varname> on the kernel command line; it is
+ also used when a file system check on a required file system fails and boot-up cannot
continue. Compare with <filename>rescue.target</filename>, which serves a similar
purpose, but also starts the most basic services and mounts all file systems.</para>
- <para>Use the <literal>systemd.unit=emergency.target</literal> kernel command line
- option to boot into this mode. A short alias for this kernel command line option is
- <literal>emergency</literal>, for compatibility with SysV.</para>
-
<para>In many ways booting into <filename>emergency.target</filename> is similar to the
effect of booting with <literal>init=/bin/sh</literal> on the kernel command line,
except that emergency mode provides you with the full system and service manager, and
allows starting individual units in order to continue the boot process in steps.</para>
+
+ <para>Note that depending on how <filename>emergency.target</filename> is reached, the root file
+ system might be mounted read-only or read-write (no remounting is done specially for this
+ target). For example, the system may boot with root mounted read-only when <varname>ro</varname>
+ is used on the kernel command line and remain this way for <filename>emergency.target</filename>,
+ or the system may transition to <filename>emergency.target</filename> after the system has been
+ partially booted and disks have already been remounted read-write.</para>
</listitem>
</varlistentry>
<varlistentry>