]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
Merge pull request #4362 from poettering/journalbootlistfix
authorZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Thu, 13 Oct 2016 11:42:39 +0000 (07:42 -0400)
committerZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Thu, 13 Oct 2016 11:45:09 +0000 (07:45 -0400)
1  2 
src/journal/journald-server.c

index f01cf1d93701562897f98b3e0d0a9db3e468e55d,3224bdbf5f6b7e4d362f42260452f85cb4506564..381182fa2c89f1fc8da3febb720a972f09562a66
@@@ -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;
 -                log_warning("%s: Journal file is from the future, rotateing.", f->path);
+         case -ETXTBSY:         /* Journal file is from the future */
++                log_warning("%s: Journal file is from the future, rotating.", f->path);
+                 return true;
          default:
                  return false;
          }