Merge nss-myhostname

[elogind.git] / catalog / systemd.catalog

diff --git a/catalog/systemd.catalog b/catalog/systemd.catalog
index e2ef0e0ef5897cc824b5dd32d3b991d7c5d4a699..5dcbd4620a3cde684884bb9d602d34682868a04e 100644 (file)
--- a/catalog/systemd.catalog
+++ b/catalog/systemd.catalog
@@ -20,6 +20,8 @@
 # The catalog format is documented on
 # http://www.freedesktop.org/wiki/Software/systemd/catalog
 
+# For an explanation why we do all this, see https://xkcd.com/1024/
+
 -- f77379a8490b408bbe5f6940505a777b
 Subject: The Journal has been started
 Defined-By: systemd
@@ -165,7 +167,7 @@ Kernel start-up required @KERNEL_USEC@ microseconds.
 
 Initial RAM disk start-up required @INITRD_USEC@ microseconds.
 
-Userspace start-up required @KERNEL_USEC@ microseconds.
+Userspace start-up required @USERSPACE_USEC@ microseconds.
 
 -- 6bbd95ee977941e497c48be27c254128
 Subject: System sleep state @SLEEP@ entered
@@ -274,3 +276,16 @@ One or more messages could not be forwarded to the syslog service
 running side-by-side with journald. This usually indicates that the
 syslog implementation has not been able to keep up with the speed of
 messages queued.
+
+-- 1dee0369c7fc4736b7099b38ecb46ee7
+Subject: Mount point is not empty
+Defined-By: systemd
+Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel
+Documentation: http://www.freedesktop.org/wiki/Software/systemd/catalog/@MESSAGE_ID@
+
+The directory @WHERE@ is specified as the mount point (second field in
+/etc/fstab or Where= field in systemd unit file) and is not empty.
+This does not interfere with mounting, but the pre-exisiting files in
+this directory become inaccessible. To see those over-mounted files,
+please manually mount the underlying file system to a secondary
+location.