Tree - rpms/systemd - CentOS Git server

Forked from rpms/systemd 2 years ago

Blob History Raw

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