diff --git a/TODO b/TODO
index 11b9dbb9ff..0db681b762 100644
--- a/TODO
+++ b/TODO
@@ -25,12 +25,14 @@ F15:
* NM should pull in network.target, ntpd should pull in rtc-set.target.
-* fix sysv parser to add right wants dependencies
-
* document default dependencies
+* remove KillMode=process-group
+
Features:
+* when key file cannot be found, read it from kbd in cryptsetup
+
* hide passwords on TAB
* get rid of random file name in generator directory?
diff --git a/man/systemd.swap.xml b/man/systemd.swap.xml
index 45f8f40ae1..d95e39ed8e 100644
--- a/man/systemd.swap.xml
+++ b/man/systemd.swap.xml
@@ -68,13 +68,23 @@
specific configuration options are configured in the
[Swap] section.
- Swap units must be named after the devices they
- control. Example: the swap device
+ Swap units must be named after the devices
+ (resp. files) they control. Example: the swap device
/dev/sda5 must be configured in a
unit file dev-sda5.swap. For
details about the escaping logic used to convert a
file system path to a unit name see
systemd.unit5.
+
+ All swap units automatically get the appropriate
+ dependencies on the devices (resp. on the mount points
+ of the files) they are actived from.
+
+ Swap units with
+ DefaultDependencies= enabled
+ implicitly acquire a conflicting dependency to
+ umount.target so that they are
+ deactivated at shutdown.
@@ -88,6 +98,13 @@
If a swap device or file is configured in both
/etc/fstab and a unit file the
configuration in the latter takes precedence.
+
+ Unless the option is set
+ for them all swap units configured in
+ /etc/fstab are also added as
+ requirements to swap.target, so
+ that they are waited for and activated during
+ boot.
@@ -149,7 +166,7 @@
a time span value such as "5min
20s". Pass 0 to disable the timeout
logic. Defaults to
- 60s.
+ 3min.
diff --git a/man/systemd.target.xml b/man/systemd.target.xml
index 5c26427596..6b1dbfbde3 100644
--- a/man/systemd.target.xml
+++ b/man/systemd.target.xml
@@ -83,14 +83,15 @@
systemd.special7
for details).
- Unless
- DefaultDependencies= is set to
- , target units will
- implicitly complement all configured dependencies of type
- Wants=,
+ Unless DefaultDependencies=
+ is set to , target units will
+ implicitly complement all configured dependencies of
+ type Wants=,
Requires=,
RequiresOverridable= with
- dependencies of type After=.
+ dependencies of type After= if the
+ units in question also have
+ DefaultDependencies=true.