summaryrefslogtreecommitdiffstats
path: root/catalog
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2018-11-13 20:36:51 +0100
committerLennart Poettering <lennart@poettering.net>2018-11-16 15:22:48 +0100
commit0b999d34b15303da9ee349ddba258a63ff35eca8 (patch)
tree392f90cee35354b598a1662f313b545686d47b98 /catalog
parentjob: also include job ID in log messages when we begin with a job (diff)
downloadsystemd-0b999d34b15303da9ee349ddba258a63ff35eca8.tar.xz
systemd-0b999d34b15303da9ee349ddba258a63ff35eca8.zip
catalog: update job begin/done messages
These texts have been slightly misleading previously, as they talked about units, not jobs, but are actually generated for jobs, not units. This difference matters as units can change state without a job requesting that. Also, the message be02cf6855d2428ba40df7e9d022f03d was particularly wrong, as it claimed the unit failed, while it actually is the start job that failed, which is a major difference, as jobs can fail without the unit actually being placed in a failed state. Let's move this message a bit up, closed to 39f53479d3a045ac8e11786248231fbf (i.e. the message seen when a start job finished successfully).
Diffstat (limited to 'catalog')
-rw-r--r--catalog/systemd.catalog.in48
1 files changed, 28 insertions, 20 deletions
diff --git a/catalog/systemd.catalog.in b/catalog/systemd.catalog.in
index 49a45890f6..2136c93d02 100644
--- a/catalog/systemd.catalog.in
+++ b/catalog/systemd.catalog.in
@@ -189,59 +189,67 @@ System shutdown has been initiated. The shutdown has now begun and
all system services are terminated and all file systems unmounted.
-- 7d4958e842da4a758f6c1cdc7b36dcc5
-Subject: Unit @UNIT@ has begun start-up
+Subject: A start job for unit @UNIT@ has begun execution
Defined-By: systemd
Support: %SUPPORT_URL%
-Unit @UNIT@ has begun starting up.
+A start job for unit @UNIT@ has begun execution.
+
+The job identifier is @JOB_ID@.
-- 39f53479d3a045ac8e11786248231fbf
-Subject: Unit @UNIT@ has finished start-up
+Subject: A start job for unit @UNIT@ has finished successfully
Defined-By: systemd
Support: %SUPPORT_URL%
-Unit @UNIT@ has finished starting up.
+A start job for unit @UNIT@ has finished successfully.
-The start-up result is @JOB_RESULT@.
+The job identifier is @JOB_ID@.
--- de5b426a63be47a7b6ac3eaac82e2f6f
-Subject: Unit @UNIT@ has begun shutting down
+-- be02cf6855d2428ba40df7e9d022f03d
+Subject: A start job for unit @UNIT@ has failed
Defined-By: systemd
Support: %SUPPORT_URL%
-Unit @UNIT@ has begun shutting down.
+A start job for unit @UNIT@ has finished with a failure.
--- 9d1aaa27d60140bd96365438aad20286
-Subject: Unit @UNIT@ has finished shutting down
+The job identifier is @JOB_ID@ and the job result is @JOB_RESULT@.
+
+-- de5b426a63be47a7b6ac3eaac82e2f6f
+Subject: A stop job for unit @UNIT@ has begun execution
Defined-By: systemd
Support: %SUPPORT_URL%
-Unit @UNIT@ has finished shutting down.
+A stop job for unit @UNIT@ has begun execution.
--- be02cf6855d2428ba40df7e9d022f03d
-Subject: Unit @UNIT@ has failed
+The job identifier is @JOB_ID@.
+
+-- 9d1aaa27d60140bd96365438aad20286
+Subject: A stop job for unit @UNIT@ has finished
Defined-By: systemd
Support: %SUPPORT_URL%
-Unit @UNIT@ has failed.
+A stop job for unit @UNIT@ has finished.
-The result is @JOB_RESULT@.
+The job identifier is @JOB_ID@ and the job result is @JOB_RESULT@.
-- d34d037fff1847e6ae669a370e694725
-Subject: Unit @UNIT@ has begun reloading its configuration
+Subject: A reload job for unit @UNIT@ has begun execution
Defined-By: systemd
Support: %SUPPORT_URL%
-Unit @UNIT@ has begun reloading its configuration
+A reload job for unit @UNIT@ has begun execution.
+
+The job identifier is @JOB_ID@.
-- 7b05ebc668384222baa8881179cfda54
-Subject: Unit @UNIT@ has finished reloading its configuration
+Subject: A reload job for unit @UNIT@ has finished
Defined-By: systemd
Support: %SUPPORT_URL%
-Unit @UNIT@ has finished reloading its configuration
+A reload job for unit @UNIT@ has finished.
-The result is @JOB_RESULT@.
+The job identifier is @JOB_ID@ and the job result is @JOB_RESULT@.
-- 641257651c1b4ec9a8624d7a40a9e1e7
Subject: Process @EXECUTABLE@ could not be executed