forked from pool/systemd
b8b836245b
- Add systemctl-options.patch: handle SYSTEMCTL_OPTIONS internaly (bnc#798620). - Update crypt-loop-file.patch to correctly detect crypto loop files (bnc#799514). - Add journalctl-remove-leftover-message.patch: remove debug message in systemctl. - Add job-avoid-recursion-when-cancelling.patch: prevent potential recursion when cancelling a service. - Add sysctl-parse-all-keys.patch: ensure sysctl file is fully parsed. - Add journal-fix-cutoff-max-date.patch: fix computation of cutoff max date for journal. - Add reword-rescue-mode-hints.patch: reword rescue prompt. - Add improve-overflow-checks.patch: improve time overflow checks. - Add fix-swap-behaviour-with-symlinks.patch: fix swap behaviour with symlinks. - Add hostnamectl-fix-set-hostname-with-no-argument.patch: ensure hostnamectl requires an argument when called with set-hostname option. - Add agetty-overrides-term.patch: pass correctly terminal type to agetty. - Add check-for-empty-strings-in-strto-conversions.patch: better check for empty strings in strto* conversions. - Add strv-cleanup-error-path-loops.patch: cleanup strv on error path. - Add cryptsetup-handle-plain.patch: correctly handle "plain" option in cryptsetup. - Add fstab-generator-improve-error-message.patch: improve error message in fstab-generator. - Add delta-accept-t-option.patch: accept -t option in OBS-URL: https://build.opensuse.org/request/show/149703 OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=331
39 lines
1.4 KiB
Diff
39 lines
1.4 KiB
Diff
From 244692cbfb46df5ff79d07da8fb848a1165bd2fb Mon Sep 17 00:00:00 2001
|
|
From: David Herrmann <dh.herrmann@googlemail.com>
|
|
Date: Sun, 13 Jan 2013 12:28:38 +0100
|
|
Subject: [PATCH] journalctl: quit on I/O error
|
|
|
|
This makes journalctl quit on ferror() conditions on stdout. It fixes an
|
|
annoying bug if you pipe its output through 'less' and press 'q'. Without
|
|
this fix journalctl will continue reading all journal data until EOF which
|
|
can take quite some time. For instance on my machine:
|
|
|
|
david-nb ~ # time journalctl | wc -l
|
|
327240
|
|
|
|
real 1m13.039s
|
|
user 1m0.217s
|
|
sys 0m10.467s
|
|
|
|
However, expected behavior is journalctl to quit when its pager closed the
|
|
output pipe.
|
|
|
|
Signed-off-by: David Herrmann <dh.herrmann@googlemail.com>
|
|
---
|
|
src/journal/journalctl.c | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
Index: systemd-195/src/journal/journalctl.c
|
|
===================================================================
|
|
--- systemd-195.orig/src/journal/journalctl.c
|
|
+++ systemd-195/src/journal/journalctl.c
|
|
@@ -1035,7 +1035,7 @@ int main(int argc, char *argv[]) {
|
|
on_tty() * OUTPUT_COLOR;
|
|
|
|
r = output_journal(stdout, j, arg_output, 0, flags);
|
|
- if (r < 0)
|
|
+ if (r < 0 || ferror(stdout))
|
|
goto finish;
|
|
|
|
need_seek = true;
|