Skip to content

Commit

Permalink
Merge pull request systemd#29059 from YHNdnzj/catalog-followup
Browse files Browse the repository at this point in the history
Follow-ups for recently-added catalogs
  • Loading branch information
bluca authored Sep 4, 2023
2 parents a832087 + 1dc604d commit 7874b98
Show file tree
Hide file tree
Showing 3 changed files with 58 additions and 50 deletions.
79 changes: 43 additions & 36 deletions catalog/systemd.catalog.in
Original file line number Diff line number Diff line change
Expand Up @@ -190,142 +190,149 @@ System factory reset has been initiated. The precise operation this
executes is implementation-defined, but typically has the effect of
reverting the system's state and configuration to vendor defaults.

--d9ec5e95e4b646aaaea2fd05214edbda
Subject: Exiting PID 1...
-- d9ec5e95e4b646aaaea2fd05214edbda
Subject: Container init crashed
Defined-By: systemd
Support: %SUPPORT_URL%

When systemd crashes, we want to either freeze or exit or reboot.
For containers we choose the option of exiting.
Container init has crashed and exited.
The details of the crash can be obtained from the container manager.

To fix:
Check the container manager for details.

-- 3ed0163e868a4417ab8b9e210407a96c
Subject: Failed to reboot
Subject: System reboot failed after crash
Defined-By: systemd
Support: %SUPPORT_URL%

Reboot has failed when systemd attempted to reboot after a crash.

-- 645c735537634ae0a32b15a7c6cba7d4
Subject: Freezing execution
Subject: Init execution freezed
Defined-By: systemd
Support: %SUPPORT_URL%

Freezing execution after fatal error.
Systemd freezed execution after fatal error.

-- 5addb3a06a734d3396b794bf98fb2d01
Subject: Caught <signal>, not dumping core
Subject: Init received fatal signal while coredump is disabled
Defined-By: systemd
Support: %SUPPORT_URL%

In the instance of a crash arising from corrupted memory. The signal caught is propagated, but the core is not dumped.
Systemd received fatal signal, but core dumping is disabled.

-- 5c9e98de4ab94c6a9d04d0ad793bd903
Subject: Caught <signal>, cannot fork for core dump
Subject: Init received fatal signal but fork failed
Defined-By: systemd
Support: %SUPPORT_URL%

Systemd received fatal signal, but failed to fork to dump the core.

-- 5e6f1f5e4db64a0eaee3368249d20b94
Subject: Caught <signal> from unknown sender process
Subject: Init received fatal signal from unknown sender process
Defined-By: systemd
Support: %SUPPORT_URL%

-- 83f84b35ee264f74a3896a9717af34cb
Subject: Caught <signal> from our own process
Subject: Init received fatal signal from our own process
Defined-By: systemd
Support: %SUPPORT_URL%

-- 3a73a98baf5b4b199929e3226c0be783
Subject: Caught <signal> from <PID>
Subject: Init received fatal signal from other process
Defined-By: systemd
Support: %SUPPORT_URL%

-- 2ed18d4f78ca47f0a9bc25271c26adb4
Subject: Caught <signal>, waitpid() failed
Subject: Init received fatal signal but waitpid() failed
Defined-By: systemd
Support: %SUPPORT_URL%

Systemd received fatal signal, but waitpid() failed when
trying to dump the core.

-- 56b1cd96f24246c5b607666fda952356
Subject: Caught <signal>, coredump failed (child <PID>, code=<code>, status=<status>.
Subject: Init received fatal signal but coredump failed
Defined-By: systemd
Support: %SUPPORT_URL%

-- 4ac7566d4d7548f4981f629a28f0f829
Subject: Caught <signal>, dumped core as pid <PID>
Subject: Init received fatal signal and dumped core
Defined-By: systemd
Support: %SUPPORT_URL%

-- 38e8b1e039ad469291b18b44c553a5b7
Subject: Failed to fork off crash shell

Subject: Init failed to fork crash shell
Defined-By: systemd
Support: %SUPPORT_URL%

Systemd crashed and failed to fork off crash shell.

-- 872729b47dbe473eb768ccecd477beda
Subject: execle() failed
Subject: Crash shell failed to execute
Defined-By: systemd
Support: %SUPPORT_URL%

Systemd crashed and failed to spawn crash shell.

-- 658a67adc1c940b3b3316e7e8628834a
Subject: Failed to load SELinux policy.
Subject: Manager failed to load SELinux policy
Defined-By: systemd
Support: %SUPPORT_URL%

-- e6f456bd92004d9580160b2207555186
Subject: Battery level critically low. Please connect your charger or the system will power off in 10 seconds.
Subject: Battery level critically low, waiting for charger
Defined-By: systemd
Support: %SUPPORT_URL%

Battery level is critically low. Please connect your charger
or the system will power off in 10 seconds.

-- 267437d33fdd41099ad76221cc24a335
Subject: Battery level critically low, powering off.
Subject: Battery level critically low, powering off
Defined-By: systemd
Support: %SUPPORT_URL%

-- 79e05b67bc4545d1922fe47107ee60c5
Subject: Failed to run main loop
Subject: Manager failed to run main loop
Defined-By: systemd
Support: %SUPPORT_URL%

-- dbb136b10ef4457ba47a795d62f108c9
Subject: Failed to determine <XDG_DIR> path
Subject: User manager failed to determine $XDG_RUNTIME_DIR path
Defined-By: systemd
Support: %SUPPORT_URL%

-- ed158c2df8884fa584eead2d902c1032
Subject: Failed to drop capability bounding set of usermode helpers
Subject: Init failed to drop capability bounding set of usermode helpers
Defined-By: systemd
Support: %SUPPORT_URL%

-- 42695b500df048298bee37159caa9f2e
Subject: Failed to drop capability bounding set
Subject: Init failed to drop capability bounding set
Defined-By: systemd
Support: %SUPPORT_URL%

-- bfc2430724ab44499735b4f94cca9295
Subject: Failed to disable new privileges
Subject: User manager failed to disable new privileges
Defined-By: systemd
Support: %SUPPORT_URL%

-- 59288af523be43a28d494e41e26e4510
Subject: Failed to start default target <target>
Subject: Manager failed to start default target
Defined-By: systemd
Support: %SUPPORT_URL%

-- 689b4fcc97b4486ea5da92db69c9e314
Subject: Failed to isolate default target <target>
Subject: Manager failed to isolate default target
Defined-By: systemd
Support: %SUPPORT_URL%

-- 5ed836f1766f4a8a9fc5da45aae23b29
Subject: Failed to allocate fd set
Subject: Manager failed to collect passed file descriptors
Defined-By: systemd
Support: %SUPPORT_URL%

-- 6a40fbfbd2ba4b8db02fb40c9cd090d7
Subject: Failed to fix up PID1 environment
Subject: Init failed to fix up environment variables
Defined-By: systemd
Support: %SUPPORT_URL%

Expand All @@ -335,7 +342,7 @@ Defined-By: systemd
Support: %SUPPORT_URL%

-- d67fa9f847aa4b048a2ae33535331adb
Subject: Failed to write Smack onlycap list
Subject: Manager failed to write Smack onlycap list
Defined-By: systemd
Support: %SUPPORT_URL%

Expand All @@ -345,7 +352,7 @@ Defined-By: systemd
Support: %SUPPORT_URL%

-- d18e0339efb24a068d9c1060221048c2
Subject: Failed to fork off valgrind helper
Subject: Init failed to fork off valgrind helper
Defined-By: systemd
Support: %SUPPORT_URL%

Expand Down
17 changes: 9 additions & 8 deletions src/core/crash-handler.c
Original file line number Diff line number Diff line change
Expand Up @@ -120,21 +120,22 @@ _noreturn_ static void crash(int sig, siginfo_t *siginfo, void *context) {
LOG_MESSAGE("Caught <%s>, waitpid() failed: %m", signal_to_string(sig)),
"MESSAGE_ID=" SD_MESSAGE_CRASH_WAITPID_FAILED_STR);
else if (status.si_code != CLD_DUMPED) {
const char *s = status.si_code == CLD_EXITED
? exit_status_to_string(status.si_status, EXIT_STATUS_LIBC)
: signal_to_string(status.si_status);
const char *s = status.si_code == CLD_EXITED ?
exit_status_to_string(status.si_status, EXIT_STATUS_LIBC) :
signal_to_string(status.si_status);

log_struct(LOG_EMERG,
LOG_MESSAGE("Caught <%s>, core dump failed (child "PID_FMT", code=%s, status=%i/%s).",
signal_to_string(sig),
pid,
sigchld_code_to_string(status.si_code),
status.si_status, strna(s)),
signal_to_string(sig),
pid,
sigchld_code_to_string(status.si_code),
status.si_status,
strna(s)),
"MESSAGE_ID=" SD_MESSAGE_CRASH_COREDUMP_FAILED_STR);
} else
log_struct(LOG_EMERG,
LOG_MESSAGE("Caught <%s>, dumped core as pid "PID_FMT".",
signal_to_string(sig), pid),
signal_to_string(sig), pid),
"MESSAGE_ID=" SD_MESSAGE_CRASH_COREDUMP_PID_STR);
}
}
Expand Down
12 changes: 6 additions & 6 deletions src/systemd/sd-messages.h
Original file line number Diff line number Diff line change
Expand Up @@ -82,12 +82,12 @@ _SD_BEGIN_DECLARATIONS;
#define SD_MESSAGE_FACTORY_RESET SD_ID128_MAKE(c1,4a,af,76,ec,28,4a,5f,a1,f1,05,f8,8d,fb,06,1c)
#define SD_MESSAGE_FACTORY_RESET_STR SD_ID128_MAKE_STR(c1,4a,af,76,ec,28,4a,5f,a1,f1,05,f8,8d,fb,06,1c)

#define SD_MESSAGE_CRASH_EXIT SD_ID128_MAKE(d9,ec,5e,95,e4,b6,46,aa,ae,a2,fd,05,21,4e,db,da)
#define SD_MESSAGE_CRASH_EXIT_STR SD_ID128_MAKE_STR(d9,ec,5e,95,e4,b6,46,aa,ae,a2,fd,05,21,4e,db,da)
#define SD_MESSAGE_CRASH_FAILED SD_ID128_MAKE(3e,d0,16,3e,86,8a,44,17,ab,8b,9e,21,04,07,a9,6c)
#define SD_MESSAGE_CRASH_FAILED_STR SD_ID128_MAKE_STR(3e,d0,16,3e,86,8a,44,17,ab,8b,9e,21,04,07,a9,6c)
#define SD_MESSAGE_CRASH_FREEZE SD_ID128_MAKE(64,5c,73,55,37,63,4a,e0,a3,2b,15,a7,c6,cb,a7,d4)
#define SD_MESSAGE_CRASH_FREEZE_STR SD_ID128_MAKE_STR(64,5c,73,55,37,63,4a,e0,a3,2b,15,a7,c6,cb,a7,d4)
#define SD_MESSAGE_CRASH_EXIT SD_ID128_MAKE(d9,ec,5e,95,e4,b6,46,aa,ae,a2,fd,05,21,4e,db,da)
#define SD_MESSAGE_CRASH_EXIT_STR SD_ID128_MAKE_STR(d9,ec,5e,95,e4,b6,46,aa,ae,a2,fd,05,21,4e,db,da)
#define SD_MESSAGE_CRASH_FAILED SD_ID128_MAKE(3e,d0,16,3e,86,8a,44,17,ab,8b,9e,21,04,07,a9,6c)
#define SD_MESSAGE_CRASH_FAILED_STR SD_ID128_MAKE_STR(3e,d0,16,3e,86,8a,44,17,ab,8b,9e,21,04,07,a9,6c)
#define SD_MESSAGE_CRASH_FREEZE SD_ID128_MAKE(64,5c,73,55,37,63,4a,e0,a3,2b,15,a7,c6,cb,a7,d4)
#define SD_MESSAGE_CRASH_FREEZE_STR SD_ID128_MAKE_STR(64,5c,73,55,37,63,4a,e0,a3,2b,15,a7,c6,cb,a7,d4)

#define SD_MESSAGE_CRASH_NO_COREDUMP SD_ID128_MAKE(5a,dd,b3,a0,6a,73,4d,33,96,b7,94,bf,98,fb,2d,01)
#define SD_MESSAGE_CRASH_NO_COREDUMP_STR SD_ID128_MAKE_STR(5a,dd,b3,a0,6a,73,4d,33,96,b7,94,bf,98,fb,2d,01)
Expand Down

0 comments on commit 7874b98

Please sign in to comment.