[systemd-commits] 4 commits - TODO catalog/systemd.catalog man/journalctl.xml src/systemctl src/systemd units/emergency.service.in units/rescue.service.m4.in
Lennart Poettering
lennart at kemper.freedesktop.org
Thu Nov 15 18:04:27 PST 2012
TODO | 8 +
catalog/systemd.catalog | 259 +++++++++++++++++++++++++++++++++++++--------
man/journalctl.xml | 9 +
src/systemctl/systemctl.c | 4
src/systemd/sd-messages.h | 3
units/emergency.service.in | 2
units/rescue.service.m4.in | 2
7 files changed, 238 insertions(+), 49 deletions(-)
New commits:
commit 2d27a19d924a0ede0d95ff2ab19a98211e716c4b
Author: Lennart Poettering <lennart at poettering.net>
Date: Fri Nov 16 03:04:08 2012 +0100
man: link up journalctl man page with developer documenation
diff --git a/man/journalctl.xml b/man/journalctl.xml
index e7fff0c..8b26cd9 100644
--- a/man/journalctl.xml
+++ b/man/journalctl.xml
@@ -247,8 +247,13 @@
pointers to support forums, developer
documentation and any other relevant
manuals. Note that help texts are not
- available for all messages but only
- for selected ones.</para></listitem>
+ available for all messages, but only
+ for selected ones. For more
+ information on the message catalog
+ please refer to the <ulink
+ url="http://www.freedesktop.org/wiki/Software/systemd/catalog">Message
+ Catalog Developer
+ Documentation</ulink>.</para></listitem>
</varlistentry>
<varlistentry>
commit 95ec8647c70b2c1fe816301aca2143d587a60c82
Author: Lennart Poettering <lennart at poettering.net>
Date: Fri Nov 16 03:03:54 2012 +0100
journal: recommend journalctl -x more often
diff --git a/src/systemctl/systemctl.c b/src/systemctl/systemctl.c
index f6eed1c..a605ed9 100644
--- a/src/systemctl/systemctl.c
+++ b/src/systemctl/systemctl.c
@@ -1342,9 +1342,9 @@ static int wait_for_jobs(DBusConnection *bus, Set *s) {
else if (streq(d.result, "canceled"))
log_error("Job for %s canceled.", strna(d.name));
else if (streq(d.result, "dependency"))
- log_error("A dependency job for %s failed. See 'journalctl -n' for details.", strna(d.name));
+ log_error("A dependency job for %s failed. See 'journalctl -xn' for details.", strna(d.name));
else if (!streq(d.result, "done") && !streq(d.result, "skipped"))
- log_error("Job for %s failed. See 'systemctl status %s' and 'journalctl -n' for details.", strna(d.name), strna(d.name));
+ log_error("Job for %s failed. See 'systemctl status %s' and 'journalctl -xn' for details.", strna(d.name), strna(d.name));
}
if (streq_ptr(d.result, "timeout"))
diff --git a/units/emergency.service.in b/units/emergency.service.in
index 129a831..442f0e0 100644
--- a/units/emergency.service.in
+++ b/units/emergency.service.in
@@ -16,7 +16,7 @@ Before=shutdown.target
Environment=HOME=/root
WorkingDirectory=/root
ExecStartPre=-/bin/plymouth quit
-ExecStartPre=-/bin/echo -e 'Welcome to emergency mode! After logging in, type "journalctl -b" to view\\nsystem logs, "systemctl reboot" to reboot, "systemctl default" to try again\\nto boot into default mode.'
+ExecStartPre=-/bin/echo -e 'Welcome to emergency mode! After logging in, type "journalctl -xb" to view\\nsystem logs, "systemctl reboot" to reboot, "systemctl default" to try again\\nto boot into default mode.'
ExecStart=-/sbin/sulogin
ExecStopPost=@SYSTEMCTL@ --fail --no-block default
Type=idle
diff --git a/units/rescue.service.m4.in b/units/rescue.service.m4.in
index 89059e0..fb14baf 100644
--- a/units/rescue.service.m4.in
+++ b/units/rescue.service.m4.in
@@ -17,7 +17,7 @@ Before=shutdown.target
Environment=HOME=/root
WorkingDirectory=/root
ExecStartPre=-/bin/plymouth quit
-ExecStartPre=-/bin/echo -e 'Welcome to rescue mode! Type "systemctl default" or ^D to enter default mode.\\nType "journalctl -b" to view system logs. Type "systemctl reboot" to reboot.'
+ExecStartPre=-/bin/echo -e 'Welcome to rescue mode! Type "systemctl default" or ^D to enter default mode.\\nType "journalctl -xb" to view system logs. Type "systemctl reboot" to reboot.'
m4_ifdef(`TARGET_FEDORA',
`EnvironmentFile=/etc/sysconfig/init
ExecStart=-/bin/bash -c "exec ${SINGLE}"',
commit 6f9e5c961992a7f12812c254272a35ead0457361
Author: Lennart Poettering <lennart at poettering.net>
Date: Fri Nov 16 03:03:30 2012 +0100
update TODO
diff --git a/TODO b/TODO
index c6a995c..982c281 100644
--- a/TODO
+++ b/TODO
@@ -21,6 +21,12 @@ F18:
Features:
+* RPM macros for message catalog update
+
+* man page for catalog APIs
+
+* When switching root, first try pivot_root, only then fall back to overmounting, to deal sanely with both the initial and later switch roots
+
* When shutdown.target is queued begin with an asynchronous sync()?
* Add ConditionBatteryPower= or ConditionACPower=? (but definitely not both)
@@ -422,8 +428,6 @@ Features:
* journal: local deserializer of export mode, http server
-* journal: message catalog
-
* document the exit codes when services fail before they are exec()ed
* save coredump in Windows/Mozilla minidump format
commit 5d6a86d7a034a1fb3d6e3f1b58e2c13739270894
Author: Lennart Poettering <lennart at poettering.net>
Date: Fri Nov 16 03:03:22 2012 +0100
catalog: add catalog entries for all of systemd's own journal messages
diff --git a/catalog/systemd.catalog b/catalog/systemd.catalog
index 91d0408..3374139 100644
--- a/catalog/systemd.catalog
+++ b/catalog/systemd.catalog
@@ -1,99 +1,276 @@
+b# This file is part of systemd.
+#
+# Copyright 2012 Lennart Poettering
+#
+# systemd is free software; you can redistribute it and/or modify it
+# under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; either version 2.1 of the License, or
+# (at your option) any later version.
+#
+# systemd is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with systemd; If not, see <http://www.gnu.org/licenses/>.
+
+# Message catalog for systemd's own messages
+
+# The catalog format is documented on
+# http://www.freedesktop.org/wiki/Software/systemd/catalog
+
+-- f77379a8490b408bbe5f6940505a777b
+Subject: The Journal has been started
+Defined-By: systemd
+Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel
+Documentation: http://www.freedesktop.org/wiki/Software/systemd/catalog/@MESSAGE_ID@
+
+The system journal process has been starting up, opened the journal
+files for writing and is now ready to process requests.
+
+-- d93fb3c9c24d451a97cea615ce59c00b
+Subject: The Journal has been stopped
+Defined-By: systemd
+Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel
+Documentation: http://www.freedesktop.org/wiki/Software/systemd/catalog/@MESSAGE_ID@
+
+The system journal process has shut down and closed all currently
+active journal files.
+
+-- a596d6fe7bfa4994828e72309e95d61e
+Subject: Messages from a service have been suppressed
+Defined-By: systemd
+Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel
+Documentation: man:journald.conf(5)
+Documentation: http://www.freedesktop.org/wiki/Software/systemd/catalog/@MESSAGE_ID@
+
+A service has logged too many messages within a time period. Messages
+from the service have been dropped.
+
+Note that only messages from the service in question have been
+dropped, other services' messages are unaffected.
+
+The limits when messages are dropped may be configured with
+RateLimitInterval= and RateLimitBurst= in
+/etc/systemd/journald.conf. See journald.conf(5) for details.
+
+-- e9bf28e6e834481bb6f48f548ad13606
+Subject: Journal messages have been missed
+Defined-By: systemd
+Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel
+Documentation: http://www.freedesktop.org/wiki/Software/systemd/catalog/@MESSAGE_ID@
+
+Kernel messages have been lost as the journal system has been unable
+to process them quickly enough.
+
-- fc2e22bc6ee647b6b90729ab34a250b1
Subject: Process @COREDUMP_PID@ (@COREDUMP_COMM@) dumped core
Defined-By: systemd
Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel
-Developer-Description: http://www.freedesktop.org/wiki/Software/systemd/catalog/@MESSAGE_ID@
+Documentation: man:core(5)
+Documentation: http://www.freedesktop.org/wiki/Software/systemd/catalog/@MESSAGE_ID@
Process @COREDUMP_PID@ (@COREDUMP_COMM@) crashed and dumped core.
This usually indicates a programming error in the crashing program and
-should be reported to the vendor as a bug.
+should be reported to its vendor as a bug.
-- fc2e22bc6ee647b6b90729ab34a250b1 de
Subject: Speicherabbild für Prozess @COREDUMP_PID@ (@COREDUMP_COMM) generiert
Defined-By: systemd
Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel
-Developer-Description: http://www.freedesktop.org/wiki/Software/systemd/catalog/@MESSAGE_ID@
+Documentation: man:core(5)
+Documentation: http://www.freedesktop.org/wiki/Software/systemd/catalog/@MESSAGE_ID@
Prozess @COREDUMP_PID@ (@COREDUMP_COMM@) ist abgebrochen worden und
ein Speicherabbild wurde generiert.
Ãœblicherweise ist dies ein Hinweis auf einen Programmfehler und sollte
-als Fehler dem Hersteller gemeldet werden.
+als Fehler dem jeweiligen Hersteller gemeldet werden.
+
+-- 8d45620c1a4348dbb17410da57c60c66
+Subject: A new session @SESSION_ID@ has been created for user @USER_ID@
+Defined-By: systemd
+Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel
+Documentation: http://www.freedesktop.org/wiki/Software/systemd/multiseat
+Documentation: http://www.freedesktop.org/wiki/Software/systemd/catalog/@MESSAGE_ID@
+
+A new session with the ID @SESSION_ID@ has been created for the user @USER_ID at .
+
+The leading process of the session is @LEADER at .
+
+-- 3354939424b4456d9802ca8333ed424a
+Subject: A session @SESSION_ID@ has been terminated
+Defined-By: systemd
+Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel
+Documentation: http://www.freedesktop.org/wiki/Software/systemd/multiseat
+Documentation: http://www.freedesktop.org/wiki/Software/systemd/catalog/@MESSAGE_ID@
+
+A session with the ID @SESSION_ID@ has been terminated.
+
+-- fcbefc5da23d428093f97c82a9290f7b
+Subject: A new seat @SEAT_ID@ is now available
+Defined-By: systemd
+Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel
+Documentation: http://www.freedesktop.org/wiki/Software/systemd/multiseat
+Documentation: http://www.freedesktop.org/wiki/Software/systemd/catalog/@MESSAGE_ID@
+
+A new seat @SEAT_ID@ has been configured and is now available.
+
+-- e7852bfe46784ed0accde04bc864c2d5
+Subject: A seat @SEAT_ID@ has now been removed
+Defined-By: systemd
+Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel
+Documentation: http://www.freedesktop.org/wiki/Software/systemd/multiseat
+Documentation: http://www.freedesktop.org/wiki/Software/systemd/catalog/@MESSAGE_ID@
+
+A seat @SEAT_ID@ has been removed and is no longer avilable.
-- c7a787079b354eaaa9e77b371893cd27
Subject: Time change
Defined-By: systemd
Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel
-Developer-Description: http://www.freedesktop.org/wiki/Software/systemd/catalog/@MESSAGE_ID@
+Documentation: http://www.freedesktop.org/wiki/Software/systemd/catalog/@MESSAGE_ID@
-The system clock has been changed.
+The system clock has been changed to @REALTIME@ usec after January 1st, 1970.
-- c7a787079b354eaaa9e77b371893cd27 de
Subject: Zeitänderung
Defined-By: systemd
Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel
-Developer-Description: http://www.freedesktop.org/wiki/Software/systemd/catalog/@MESSAGE_ID@
+Documentation: http://www.freedesktop.org/wiki/Software/systemd/catalog/@MESSAGE_ID@
-Die System-Zeit wurde geändert.
+Die System-Zeit wurde geändert auf @REALTIME@ usec after January 1st, 1970.
-- 45f82f4aef7a4bbf942ce861d1f20990
-Subject: Time zone change
+Subject: Time zone change to @TIMEZONE@
Defined-By: systemd
Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel
-Developer-Description: http://www.freedesktop.org/wiki/Software/systemd/catalog/@MESSAGE_ID@
+Documentation: http://www.freedesktop.org/wiki/Software/systemd/catalog/@MESSAGE_ID@
-The system time zone has been changed.
+The system time zone has been changed to @TIMEZONE at .
--- f77379a8490b408bbe5f6940505a777b
-Subject: The Journal has been started
+-- b07a249cd024414a82dd00cd181378ff
+Subject: System start-up is now complete
Defined-By: systemd
Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel
-Developer-Description: http://www.freedesktop.org/wiki/Software/systemd/catalog/@MESSAGE_ID@
+Documentation: http://www.freedesktop.org/wiki/Software/systemd/catalog/@MESSAGE_ID@
-The system journal process has been starting up, opened the journal
-files for writing and is now ready to process requests.
+All system services necessary queued for starting at boot have been
+successfully started. Note that this does not mean that the machine is
+now idle as services might still be busy with completing start-up.
--- d93fb3c9c24d451a97cea615ce59c00b
-Subject: The Journal has been stopped
+Kernel start-up required @KERNEL_USEC@ usec.
+
+Initial RAM disk start-up required @INITRD_USEC@ usec.
+
+Userspace start-up required @KERNEL_USEC@ usec.
+
+-- 6bbd95ee977941e497c48be27c254128
+Subject: System sleep state @SLEEP@ entered
Defined-By: systemd
Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel
-Developer-Description: http://www.freedesktop.org/wiki/Software/systemd/catalog/@MESSAGE_ID@
+Documentation: http://www.freedesktop.org/wiki/Software/systemd/catalog/@MESSAGE_ID@
-The system journal process has shut down and closed all currently
-active journal files.
+The system has now entered the @SLEEP@ sleep state.
--- fcbefc5da23d428093f97c82a9290f7b
-Subject: A new seat @SEAT_ID@ is now available
+-- 8811e6df2a8e40f58a94cea26f8ebf14
+Subject: System sleep state @SLEEP@ left
Defined-By: systemd
Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel
-Developer-Description: http://www.freedesktop.org/wiki/Software/systemd/catalog/@MESSAGE_ID@
+Documentation: http://www.freedesktop.org/wiki/Software/systemd/catalog/@MESSAGE_ID@
-A new seat @SEAT_ID@ has been configured and is now available.
+The system has now left the @SLEEP@ sleep state.
--- 8d45620c1a4348dbb17410da57c60c66
-Subject: A new session @SESSION_ID@ has been created for user @USER_ID@
+-- 98268866d1d54a499c4e98921d93bc40
+Subject: System shutdown initiated
Defined-By: systemd
Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel
-Developer-Description: http://www.freedesktop.org/wiki/Software/systemd/catalog/@MESSAGE_ID@
+Documentation: http://www.freedesktop.org/wiki/Software/systemd/catalog/@MESSAGE_ID@
-A new session with the ID @SESSION_ID@ has been created for the user @USER_ID at .
+Systemd shutdown has been initiated. The shutdown has now begun and
+all system services are terminated and all file systems unmounted.
-The leading process of the session is @LEADER at .
+-- 7d4958e842da4a758f6c1cdc7b36dcc5
+Subject: Unit @UNIT@ has begun with start-up
+Defined-By: systemd
+Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel
+Documentation: http://www.freedesktop.org/wiki/Software/systemd/catalog/@MESSAGE_ID@
--- a596d6fe7bfa4994828e72309e95d61e
-Subject: Messages from a service have been suppressed
+Unit @UNIT@ has begun starting up.
+
+-- 39f53479d3a045ac8e11786248231fbf
+Subject: Unit @UNIT@ has finished start-up
Defined-By: systemd
Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel
-Developer-Description: http://www.freedesktop.org/wiki/Software/systemd/catalog/@MESSAGE_ID@
-See: man:journald.conf(5)
+Documentation: http://www.freedesktop.org/wiki/Software/systemd/catalog/@MESSAGE_ID@
-A service has logged too many messages within a time period. Messages
-from the service have been dropped.
+Unit @UNIT@ has finished starting up.
-Note that only messages from the service in question have been
-dropped, other services' messages are unaffected.
+The start-up result is @RESULT at .
-The limits when messages are dropped may be configured with
-RateLimitInterval= and RateLimitBurst= in
-/etc/systemd/journald.conf. See journald.conf(5) for details.
+-- de5b426a63be47a7b6ac3eaac82e2f6f
+Subject: Unit @UNIT@ has begun shutting down
+Defined-By: systemd
+Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel
+Documentation: http://www.freedesktop.org/wiki/Software/systemd/catalog/@MESSAGE_ID@
+
+Unit @UNIT@ has begun shutting down.
+
+-- 9d1aaa27d60140bd96365438aad20286
+Subject: Unit @UNIT@ has finished shutting down
+Defined-By: systemd
+Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel
+Documentation: http://www.freedesktop.org/wiki/Software/systemd/catalog/@MESSAGE_ID@
+
+Unit @UNIT@ has finished shutting down.
+
+-- be02cf6855d2428ba40df7e9d022f03d
+Subject: Unit @UNIT@ has failed
+Defined-By: systemd
+Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel
+Documentation: http://www.freedesktop.org/wiki/Software/systemd/catalog/@MESSAGE_ID@
+
+Unit @UNIT@ has failed.
+
+The result is @RESULT at .
+
+-- d34d037fff1847e6ae669a370e694725
+Subject: Unit @UNIT@ has begun with reloading its configuration
+Defined-By: systemd
+Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel
+Documentation: http://www.freedesktop.org/wiki/Software/systemd/catalog/@MESSAGE_ID@
+
+Unit @UNIT@ has begun with reloading its configuration
+
+-- 7b05ebc668384222baa8881179cfda54
+Subject: Unit @UNIT@ has finished reloading its configuration
+Defined-By: systemd
+Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel
+Documentation: http://www.freedesktop.org/wiki/Software/systemd/catalog/@MESSAGE_ID@
+
+Unit @UNIT@ has finished reloading its configuration
+
+The result is @RESULT at .
+
+-- 641257651c1b4ec9a8624d7a40a9e1e7
+Subject: Process @EXECUTABLE@ could not be executed
+Defined-By: systemd
+Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel
+Documentation: http://www.freedesktop.org/wiki/Software/systemd/catalog/@MESSAGE_ID@
+
+The process @EXECUTABLE@ could not be executed and failed.
+
+The error number for while executing this process is @ERRNO at .
+
+-- 0027229ca0644181a76c4e92458afa2e
+Subject: One or messages could not be forwarded to syslog
+Defined-By: systemd
+Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel
+Documentation: http://www.freedesktop.org/wiki/Software/systemd/catalog/@MESSAGE_ID@
+
+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.
diff --git a/src/systemd/sd-messages.h b/src/systemd/sd-messages.h
index 5099a36..b8b78d1 100644
--- a/src/systemd/sd-messages.h
+++ b/src/systemd/sd-messages.h
@@ -28,6 +28,9 @@
extern "C" {
#endif
+/* Hey! If you add a new message here, you *must* also update the
+ * message catalog with an appropriate explanation */
+
#define SD_MESSAGE_JOURNAL_START SD_ID128_MAKE(f7,73,79,a8,49,0b,40,8b,be,5f,69,40,50,5a,77,7b)
#define SD_MESSAGE_JOURNAL_STOP SD_ID128_MAKE(d9,3f,b3,c9,c2,4d,45,1a,97,ce,a6,15,ce,59,c0,0b)
#define SD_MESSAGE_JOURNAL_DROPPED SD_ID128_MAKE(a5,96,d6,fe,7b,fa,49,94,82,8e,72,30,9e,95,d6,1e)
More information about the systemd-commits
mailing list