chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
journald: allow restarting journald without losing stream connections
[elogind.git]
/
src
/
journal
/
journalctl.c
diff --git
a/src/journal/journalctl.c
b/src/journal/journalctl.c
index b2f6966fcabb63e40f4b7c44c7e2778f91e3b629..c91f2cf93845e06a33d4c5a79adf08c3f32c0c07 100644
(file)
--- a/
src/journal/journalctl.c
+++ b/
src/journal/journalctl.c
@@
-54,6
+54,7
@@
#include "pager.h"
#include "strv.h"
#include "set.h"
#include "pager.h"
#include "strv.h"
#include "set.h"
+#include "sigbus.h"
#include "journal-internal.h"
#include "journal-def.h"
#include "journal-verify.h"
#include "journal-internal.h"
#include "journal-def.h"
#include "journal-verify.h"
@@
-1691,7
+1692,7
@@
static int flush_to_var(void) {
break;
if (errno != ENOENT)
break;
if (errno != ENOENT)
- return log_error_errno(errno, "Failed to check for exist
a
nce of /run/systemd/journal/flushed: %m");
+ return log_error_errno(errno, "Failed to check for exist
e
nce of /run/systemd/journal/flushed: %m");
r = fd_wait_for_event(watch_fd, POLLIN, USEC_INFINITY);
if (r < 0)
r = fd_wait_for_event(watch_fd, POLLIN, USEC_INFINITY);
if (r < 0)
@@
-1723,6
+1724,7
@@
int main(int argc, char *argv[]) {
goto finish;
signal(SIGWINCH, columns_lines_cache_reset);
goto finish;
signal(SIGWINCH, columns_lines_cache_reset);
+ sigbus_install();
if (arg_action == ACTION_NEW_ID128) {
r = generate_new_id128();
if (arg_action == ACTION_NEW_ID128) {
r = generate_new_id128();