From: Lennart Poettering <lennart@poettering.net>
Date: Wed, 11 Nov 2015 15:04:29 +0000 (+0100)
Subject: journalctl: refuse to --machine= in combination with --flush, --sync or --rotate
X-Git-Tag: v228~50^2~8
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=176ee07b690a14b7f231eb719a8baa5d568c3657;p=thirdparty%2Fsystemd.git

journalctl: refuse to --machine= in combination with --flush, --sync or --rotate
---

diff --git a/src/journal/journalctl.c b/src/journal/journalctl.c
index 521360b11bd..73676042312 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