From: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Date: Thu, 13 Oct 2016 11:42:39 +0000 (-0400)
Subject: Merge pull request #4362 from poettering/journalbootlistfix
X-Git-Tag: v232~101
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c1a9199ec4361bc4ce3924034d12d7ff06fb759f;p=thirdparty%2Fsystemd.git

Merge pull request #4362 from poettering/journalbootlistfix
---

c1a9199ec4361bc4ce3924034d12d7ff06fb759f
diff --cc src/journal/journald-server.c
index f01cf1d9370,3224bdbf5f6..381182fa2c8
--- a/src/journal/journald-server.c
+++ b/src/journal/journald-server.c
@@@ -621,6 -628,11 +628,11 @@@ static bool shall_try_append_again(Jour
          case -EIDRM:           /* Journal file has been deleted */
                  log_warning("%s: Journal file has been deleted, rotating.", f->path);
                  return true;
+ 
+         case -ETXTBSY:         /* Journal file is from the future */
 -                log_warning("%s: Journal file is from the future, rotateing.", f->path);
++                log_warning("%s: Journal file is from the future, rotating.", f->path);
+                 return true;
+ 
          default:
                  return false;
          }