[gentoo-commits] gentoo-x86 commit in sys-apps/systemd/files: 0004-journal-don-t-try-to-compress-without-XZ.patch

[gentoo-commits] gentoo-x86 commit in sys-apps/systemd/files: 0004-journal-don-t-try-to-compress-without-XZ.patch

[Michal Gorny (mgorny)]

mgorny      12/09/17 09:56:27

  Added:                0004-journal-don-t-try-to-compress-without-XZ.patch
  Log:
  Backport patch for journal storage without USE=lzma, wrt bug #434972.
  
  (Portage version: 2.2.0_alpha127/cvs/Linux x86_64)

Revision  Changes    Path
1.1                  sys-apps/systemd/files/0004-journal-don-t-try-to-compress-without-XZ.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/systemd/files/0004-journal-don-t-try-to-compress-without-XZ.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/systemd/files/0004-journal-don-t-try-to-compress-without-XZ.patch?rev=1.1&content-type=text/plain

Index: 0004-journal-don-t-try-to-compress-without-XZ.patch
===================================================================
From 48b617399d7d8446c5310b2568b2af6f13331b4c Mon Sep 17 00:00:00 2001
From: Michael Olbrich <m.olbrich@pengutronix.de>
Date: Mon, 3 Sep 2012 15:46:44 +0200
Subject: [PATCH] journal: don't try to compress without XZ

otherwise the header contains the HEADER_INCOMPATIBLE_COMPRESSED
flag even though the data is not compressed and reading the journal
fails.
---
 src/journal/journal-file.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/journal/journal-file.c b/src/journal/journal-file.c
index c8193ba..8bd5273 100644
--- a/src/journal/journal-file.c
+++ b/src/journal/journal-file.c
@@ -2021,7 +2021,9 @@ int journal_file_open(
         f->flags = flags;
         f->prot = prot_from_flags(flags);
         f->writable = (flags & O_ACCMODE) != O_RDONLY;
+#ifdef HAVE_XZ
         f->compress = compress;
+#endif
         f->seal = seal;
 
         if (mmap_cache)
-- 
1.7.12