Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Drake <dsd@laptop.org>2012-11-26 19:36:36 (GMT)
committer Daniel Drake <dsd@laptop.org>2012-11-26 19:37:31 (GMT)
commitee48baacf7da0a3d03fea814a4cb41a8825592b3 (patch)
tree071a1024a05f202e11c878c4f2288a9b9b9f2f13
parent5ad280b7f03c5ed8bd3d02edca7f4cae4728352a (diff)
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.
-rw-r--r--modules/base/kspost.10.core.inc5
1 files changed, 5 insertions, 0 deletions
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/' \