From ee48baacf7da0a3d03fea814a4cb41a8825592b3 Mon Sep 17 00:00:00 2001
From: Daniel Drake <dsd@laptop.org>
Date: Mon, 26 Nov 2012 19:36:36 +0000
Subject: base: limit journald memory use (#12286)

Reduce the impacts of having two system loggers active by limiting how
much memory journald will use.

In a later cycle we should remove rsyslogd and just rely on the journal.

Thanks to Shawn Landden.
---
diff --git a/modules/base/kspost.10.core.inc b/modules/base/kspost.10.core.inc
index 70ea493..9303a61 100644
--- a/modules/base/kspost.10.core.inc
+++ b/modules/base/kspost.10.core.inc
@@ -220,6 +220,11 @@ sed -i -e 's,/var/log/messages,:omfile:$messages,' \
 	-e '/$messages/ i$outchannel messages,/var/log/messages,1048576,/usr/sbin/olpc-logrotate' \
 	/etc/rsyslog.conf
 
+# limit journal memory usage (#12286)
+sed -i -e 's/#RuntimeMaxUse=$/RuntimeMaxUse=2M/' \
+	-e 's/#RuntimeMaxFileSize=$/RuntimeMaxFileSize=1M/' \
+	/etc/systemd/journald.conf
+
 # tweak upower behaviour, mostly to ignore lid events (#11815)
 sed -i -e 's/EnableWattsUpPro=true/EnableWattsUpPro=false/' \
 	-e 's/IgnoreLid=false/IgnoreLid=true/' \
--
cgit v0.9.1