From 5a1d6cb19d45a0cd80ff7a116ae801c71e8e942b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Sun, 11 Dec 2016 11:32:28 -0500 Subject: [PATCH] pid1,catalog: use a different MESSAGE_ID for user manager startup This add a new message id for the end of user instance startup. User manager startup is a different beast then the system startup. Their descriptions are completely different too. Let's just separate them. Partially fixes #3351. Also remove "successful" from the description, since we don't know if the startup was successful or not. --- catalog/systemd.catalog.in | 15 +++++++++++++-- src/core/manager.c | 2 +- src/systemd/sd-messages.h | 1 + 3 files changed, 15 insertions(+), 3 deletions(-) diff --git a/catalog/systemd.catalog.in b/catalog/systemd.catalog.in index 2c72d312906..cb0ac0ca888 100644 --- a/catalog/systemd.catalog.in +++ b/catalog/systemd.catalog.in @@ -172,8 +172,8 @@ Defined-By: systemd Support: %SUPPORT_URL% 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. +started. Note that this does not mean that the machine is now idle as services +might still be busy with completing start-up. Kernel start-up required @KERNEL_USEC@ microseconds. @@ -181,6 +181,17 @@ Initial RAM disk start-up required @INITRD_USEC@ microseconds. Userspace start-up required @USERSPACE_USEC@ microseconds. +-- eed00a68ffd84e31882105fd973abdd1 +Subject: User manager start-up is now complete +Defined-By: systemd +Support: %SUPPORT_URL% + +The user manager instance for user @_UID@ has been started. All services queued +for starting have been started. Note that other services might still be starting +up or be started at any later time. + +Startup of the manager took @USERSPACE_USEC@ microseconds. + -- 6bbd95ee977941e497c48be27c254128 Subject: System sleep state @SLEEP@ entered Defined-By: systemd diff --git a/src/core/manager.c b/src/core/manager.c index 21cd6062c66..1192b20b741 100644 --- a/src/core/manager.c +++ b/src/core/manager.c @@ -2950,7 +2950,7 @@ static void manager_notify_finished(Manager *m) { total_usec = userspace_usec = m->finish_timestamp.monotonic - m->userspace_timestamp.monotonic; log_struct(LOG_INFO, - LOG_MESSAGE_ID(SD_MESSAGE_STARTUP_FINISHED), + LOG_MESSAGE_ID(SD_MESSAGE_USER_STARTUP_FINISHED), "USERSPACE_USEC="USEC_FMT, userspace_usec, LOG_MESSAGE("Startup finished in %s.", format_timespan(sum, sizeof(sum), total_usec, USEC_PER_MSEC)), diff --git a/src/systemd/sd-messages.h b/src/systemd/sd-messages.h index 79246ae0600..db1a21be05e 100644 --- a/src/systemd/sd-messages.h +++ b/src/systemd/sd-messages.h @@ -53,6 +53,7 @@ _SD_BEGIN_DECLARATIONS; #define SD_MESSAGE_TIMEZONE_CHANGE SD_ID128_MAKE(45,f8,2f,4a,ef,7a,4b,bf,94,2c,e8,61,d1,f2,09,90) #define SD_MESSAGE_STARTUP_FINISHED SD_ID128_MAKE(b0,7a,24,9c,d0,24,41,4a,82,dd,00,cd,18,13,78,ff) +#define SD_MESSAGE_USER_STARTUP_FINISHED SD_ID128_MAKE(ee,d0,0a,68,ff,d8,4e,31,88,21,05,fd,97,3a,bd,d1) #define SD_MESSAGE_SLEEP_START SD_ID128_MAKE(6b,bd,95,ee,97,79,41,e4,97,c4,8b,e2,7c,25,41,28) #define SD_MESSAGE_SLEEP_STOP SD_ID128_MAKE(88,11,e6,df,2a,8e,40,f5,8a,94,ce,a2,6f,8e,bf,14)