Tree - rpms/systemd - CentOS Git server

Forked from rpms/systemd 3 months ago

Blob History Raw

		803fb7	`From 4464cd08f503af0459d779d92fb943aa3ef3f9a5 Mon Sep 17 00:00:00 2001`
		803fb7	`From: Lennart Poettering <lennart@poettering.net>`
		803fb7	`Date: Sat, 3 Oct 2015 11:34:11 +0200`
		803fb7	`Subject: [PATCH] man: document that the automatic journal limits are capped to`
		803fb7	`4G by default`
		803fb7
		803fb7	`(cherry picked from commit 32252660954804747ae6b64c3921d5cb9a1c09c9)`
		803fb7	`Resolves: #1418547`
		803fb7	`---`
		803fb7	`man/journald.conf.xml \| 3 ++-`
		803fb7	`1 file changed, 2 insertions(+), 1 deletion(-)`
		803fb7
		803fb7	`diff --git a/man/journald.conf.xml b/man/journald.conf.xml`
		803fb7	`index c4f71e887..46a498b67 100644`
		803fb7	`--- a/man/journald.conf.xml`
		803fb7	`+++ b/man/journald.conf.xml`
		803fb7	`@@ -210,7 +210,8 @@`
		803fb7	`and use the smaller of the two values.</para>`
		803fb7
		803fb7	`<para>The first pair defaults to 10% and the second to 15% of`
		803fb7	`- the size of the respective file system. If the file system is`
		803fb7	`+ the size of the respective file system, but each value`
		803fb7	`+ is capped to 4G. If the file system is`
		803fb7	`nearly full and either <varname>SystemKeepFree=</varname> or`
		803fb7	`<varname>RuntimeKeepFree=</varname> is violated when`
		803fb7	`systemd-journald is started, the value will be raised to`