journald.conf: remove MinSize= settings

There's no point in making this configurable, so let's drop it in order
to simplify configuration a bit.

diff --git a/man/journald.conf.xml b/man/journald.conf.xml
index 66189bd92d70285bccaec0ad02ce7d75cfaa2ae7..70b05f600a9cc0a39961e1d12db14ae48b4ff912 100644 (file)
--- a/man/journald.conf.xml
+++ b/man/journald.conf.xml
@@ -201,11 +201,9 @@
                                 <term><varname>SystemMaxUse=</varname></term>
                                 <term><varname>SystemKeepFree=</varname></term>
                                 <term><varname>SystemMaxFileSize=</varname></term>
-                                <term><varname>SystemMinFileSize=</varname></term>
                                 <term><varname>RuntimeMaxUse=</varname></term>
                                 <term><varname>RuntimeKeepFree=</varname></term>
                                 <term><varname>RuntimeMaxFileSize=</varname></term>
-                                <term><varname>RuntimeMinFileSize=</varname></term>
 
                                 <listitem><para>Enforce size limits on
                                 the journal files stored. The options
@@ -263,16 +261,11 @@
                                 <varname>SystemMaxUse=</varname> and
                                 <varname>RuntimeMaxUse=</varname>, so
                                 that usually seven rotated journal
-                                files are kept as
-                                history. <varname>SystemMinFileSize=</varname>
-                                and
-                                <varname>RuntimeMinFileSize=</varname>
-                                control how large individual journal
-                                files grow at minimum. Defaults to
-                                64K. Specify values in bytes or use
-                                K, M, G, T, P, E as units for the
-                                specified sizes. Note that size limits
-                                are enforced synchronously to journal
+                                files are kept as history. Specify
+                                values in bytes or use K, M, G, T, P,
+                                E as units for the specified
+                                sizes. Note that size limits are
+                                enforced synchronously to journal
                                 files as they are extended, and need
                                 no explicit rotation step triggered by
                                 time.</para></listitem>

diff --git a/src/journal/journald-gperf.gperf b/src/journal/journald-gperf.gperf
index 1635e1cfc8e48378e52c95d41da25bb99bd7c63f..f616be371214e88535f855bde84640a6077e4730 100644 (file)
--- a/src/journal/journald-gperf.gperf
+++ b/src/journal/journald-gperf.gperf
@@ -22,11 +22,9 @@ Journal.RateLimitInterval,  config_parse_usec,      0, offsetof(Server, rate_lim
 Journal.RateLimitBurst,     config_parse_unsigned,  0, offsetof(Server, rate_limit_burst)
 Journal.SystemMaxUse,       config_parse_bytes_off, 0, offsetof(Server, system_metrics.max_use)
 Journal.SystemMaxFileSize,  config_parse_bytes_off, 0, offsetof(Server, system_metrics.max_size)
-Journal.SystemMinFileSize,  config_parse_bytes_off, 0, offsetof(Server, system_metrics.min_size)
 Journal.SystemKeepFree,     config_parse_bytes_off, 0, offsetof(Server, system_metrics.keep_free)
 Journal.RuntimeMaxUse,      config_parse_bytes_off, 0, offsetof(Server, runtime_metrics.max_use)
 Journal.RuntimeMaxFileSize, config_parse_bytes_off, 0, offsetof(Server, runtime_metrics.max_size)
-Journal.RuntimeMinFileSize, config_parse_bytes_off, 0, offsetof(Server, runtime_metrics.min_size)
 Journal.RuntimeKeepFree,    config_parse_bytes_off, 0, offsetof(Server, runtime_metrics.keep_free)
 Journal.MaxRetentionSec,    config_parse_usec,      0, offsetof(Server, max_retention_usec)
 Journal.MaxFileSec,         config_parse_usec,      0, offsetof(Server, max_file_usec)

diff --git a/src/journal/journald.conf b/src/journal/journald.conf
index 49648332c7bfa7908293c5543d0e437e519d676c..948318bc6267b808a38320aa0671e48fca66fd71 100644 (file)
--- a/src/journal/journald.conf
+++ b/src/journal/journald.conf
@@ -17,11 +17,9 @@
 #SystemMaxUse=
 #SystemKeepFree=
 #SystemMaxFileSize=
-#SystemMinFileSize=
 #RuntimeMaxUse=
 #RuntimeKeepFree=
 #RuntimeMaxFileSize=
-#RuntimeMinFileSize=
 #MaxRetentionSec=
 #MaxFileSec=1month
 #ForwardToSyslog=yes