diff options
| author | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2016-12-11 11:32:28 -0500 |
|---|---|---|
| committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2016-12-11 12:41:23 -0500 |
| commit | 5a1d6cb19d45a0cd80ff7a116ae801c71e8e942b (patch) | |
| tree | 7d0a6c182fb0ff264c5761279ad46672f874b882 /src | |
| parent | cb8ac9646f2c5cf3c06b7c7538eaf64334e9a997 (diff) | |
| download | systemd-5a1d6cb19d45a0cd80ff7a116ae801c71e8e942b.tar.gz systemd-5a1d6cb19d45a0cd80ff7a116ae801c71e8e942b.tar.bz2 systemd-5a1d6cb19d45a0cd80ff7a116ae801c71e8e942b.zip | |
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.
Diffstat (limited to 'src')
| -rw-r--r-- | src/core/manager.c | 2 | ||||
| -rw-r--r-- | src/systemd/sd-messages.h | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/src/core/manager.c b/src/core/manager.c index 21cd6062c6..1192b20b74 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 79246ae060..db1a21be05 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) |