From bccaff4f2ee89fdc2a1192e3fb0d276aa662346a Mon Sep 17 00:00:00 2001
From: Ramon Moesching <ramon.moesching@netmodule.com>
Date: Mon, 13 Jul 2020 11:01:21 +0200
Subject: [PATCH] Revert: "systemd-conf: changed journald storage to
 persistent"

Apply parameters during recipe install task instead of patching.

BugzID: 63714

Signed-off-by: Ramon Moesching <ramon.moesching@netmodule.com>
---
 ...anged-journald-storage-to-persistent.patch | 42 -------------------
 recipes-core/systemd/systemd-conf_%.bbappend  |  1 -
 2 files changed, 43 deletions(-)
 delete mode 100644 recipes-core/systemd/systemd-conf/0001-changed-journald-storage-to-persistent.patch

diff --git a/recipes-core/systemd/systemd-conf/0001-changed-journald-storage-to-persistent.patch b/recipes-core/systemd/systemd-conf/0001-changed-journald-storage-to-persistent.patch
deleted file mode 100644
index 0c9c56a..0000000
--- a/recipes-core/systemd/systemd-conf/0001-changed-journald-storage-to-persistent.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 6050a8a8110d6521605914b2a246f7d9f835fea4 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Tobias=20J=C3=A4ggi?= <tobias.jaeggi@netmodule.com>
-Date: Wed, 11 Mar 2020 16:01:39 +0100
-Subject: [PATCH] changed journald storage to persistent
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-With persistent storage systemd journal logs don't get lost upon reboot.
-Limited use of persistent memory with SystemMaxUse to 256M.
-
-BugzID: 61999
-
-Signed-off-by: Tobias Jäggi <tobias.jaeggi@netmodule.com>
----
- src/journal/journald.conf | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/journal/journald.conf b/src/journal/journald.conf
-index 2f1c661153..617ed51148 100644
---- a/src/journal/journald.conf
-+++ b/src/journal/journald.conf
-@@ -12,14 +12,14 @@
- # See journald.conf(5) for details.
- 
- [Journal]
--#Storage=auto
-+Storage=persistent
- #Compress=yes
- #Seal=yes
- #SplitMode=uid
- #SyncIntervalSec=5m
- #RateLimitIntervalSec=30s
- #RateLimitBurst=10000
--#SystemMaxUse=
-+SystemMaxUse=256M
- #SystemKeepFree=
- #SystemMaxFileSize=
- #SystemMaxFiles=100
--- 
-2.11.0
-
diff --git a/recipes-core/systemd/systemd-conf_%.bbappend b/recipes-core/systemd/systemd-conf_%.bbappend
index 22af0f5..df0597d 100644
--- a/recipes-core/systemd/systemd-conf_%.bbappend
+++ b/recipes-core/systemd/systemd-conf_%.bbappend
@@ -2,7 +2,6 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${MACHINE}/${PN}:${THISDIR}/${PN}:"
 
 SRC_URI_append = " \
                  file://system.conf \
-                 file://0001-changed-journald-storage-to-persistent.patch \
                  "
 
 do_install_append() {