From 176ee07b690a14b7f231eb719a8baa5d568c3657 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Wed, 11 Nov 2015 16:04:29 +0100 Subject: journalctl: refuse to --machine= in combination with --flush, --sync or --rotate --- src/journal/journalctl.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/journal/journalctl.c b/src/journal/journalctl.c index 521360b11b..7367604231 100644 --- a/src/journal/journalctl.c +++ b/src/journal/journalctl.c @@ -1771,6 +1771,11 @@ static int flush_to_var(void) { _cleanup_close_ int watch_fd = -1; int r; + if (arg_machine) { + log_error("--flush is not supported in conjunction with --machine=."); + return -EOPNOTSUPP; + } + /* Quick exit */ if (access("/run/systemd/journal/flushed", F_OK) >= 0) return 0; @@ -1828,6 +1833,11 @@ static int send_signal_and_wait(int sig, const char *watch_path) { usec_t start; int r; + if (arg_machine) { + log_error("--sync and --rotate are not supported in conjunction with --machine=."); + return -EOPNOTSUPP; + } + start = now(CLOCK_REALTIME); /* This call sends the specified signal to journald, and waits -- cgit v1.2.3-54-g00ecf