Revert "Limit journal to 7 days with "MaxRetentionSec=7day""

journald already uses the dynamic size based on available space, so let's not
deviate from upstream.

This reverts commit cba3882303d565d64edea36e7e5374a7d35dc024.

diff --git a/debian/changelog b/debian/changelog
index 4dc549d9057989f0ca94c2f0c186cbf38f6eeac5..76160e03b39f3897b61102b92631e40dcf35fc7a 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,3 @@
-systemd (218-4) UNRELEASED; urgency=medium
-
-  * Limit journal to 7 days with "MaxRetentionSec=7day", corresponding to the
-    default rsyslog rotation period. (Closes: #773538)
-
- -- Martin Pitt <mpitt@debian.org>  Tue, 30 Dec 2014 16:36:10 +0100
-
 systemd (218-3) experimental; urgency=medium
 
   * build-logind autopkgtest: Re-enforce that sd_login_monitor_new() succeeds,

diff --git a/debian/patches/Limit-journal-to-7-days.patch b/debian/patches/Limit-journal-to-7-days.patch
deleted file mode 100644 (file)
index 1d3bf80..0000000
--- a/debian/patches/Limit-journal-to-7-days.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From: Martin Pitt <martin.pitt@ubuntu.com>
-Date: Tue, 30 Dec 2014 16:34:43 +0100
-Subject: Limit journal to 7 days
-
-Set MaxRetentionSec to "7day" corresponding to the default rsyslog rotation
-period.
-
-Bug-Debian: http://bugs.debian.org/773538
----
- src/journal/journald.conf | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/journal/journald.conf b/src/journal/journald.conf
-index 5f99ee4..8641cdd 100644
---- a/src/journal/journald.conf
-+++ b/src/journal/journald.conf
-@@ -24,7 +24,7 @@
- #RuntimeMaxUse=
- #RuntimeKeepFree=
- #RuntimeMaxFileSize=
--#MaxRetentionSec=
-+MaxRetentionSec=7day
- #MaxFileSec=1month
- #ForwardToSyslog=yes
- #ForwardToKMsg=no

diff --git a/debian/patches/series b/debian/patches/series
index 2a176ff1b163585a8c9af8c54029a9acbef9f0cb..78d3843453442f89e0470a84434a5e343f33f097 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -55,4 +55,3 @@ Disable-tests-which-fail-on-buildds.patch
 Make-sd_login_monitor_new-work-for-logind-without-sy.patch
 build-sys-Fix-install-location-of-systemd.pc.patch
 Don-t-enable-audit-by-default.patch
-Limit-journal-to-7-days.patch