Commit 917d7123 authored by Martin Pitt's avatar Martin Pitt
Browse files

Clean up ...journal~ files from unclean shutdowns

Patch cherry-picked from upstream trunk.

Closes: #771707
parent 9868be77
......@@ -21,6 +21,8 @@ systemd (215-8) UNRELEASED; urgency=medium
+ Added. Be more robust when binding private unix sockets (Based on current
upstream logic) (Closes: #761306)
[ Martin Pitt ]
* Clean up ...journal~ files from unclean shutdowns. (Closes: #771707)
-- Sjoerd Simons <sjoerd@debian.org> Mon, 01 Dec 2014 22:44:48 +0100
......
From: WaLyong Cho <walyong.cho@samsung.com>
Date: Thu, 28 Aug 2014 21:33:03 +0900
Subject: journal: do server_vacuum for sigusr1
runtime journal is migrated to system journal when only
"/run/systemd/journal/flushed" exist. It's ok but according to this
the system journal directory size(max use) can be over the config. If
journal is not rotated during some time the journal directory can be
remained as over the config(or default) size. To avoid, do
server_vacuum just after the system journal migration from runtime.
---
src/journal/journald-server.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/src/journal/journald-server.c b/src/journal/journald-server.c
index 58410a2..1c69563 100644
--- a/src/journal/journald-server.c
+++ b/src/journal/journald-server.c
@@ -1224,6 +1224,7 @@ static int dispatch_sigusr1(sd_event_source *es, const struct signalfd_siginfo *
touch("/run/systemd/journal/flushed");
server_flush_to_var(s);
server_sync(s);
+ server_vacuum(s);
return 0;
}
......@@ -120,6 +120,7 @@ core-swap-only-make-configured-units-part-of-swap.ta.patch
swap-replace-Discard-setting-by-a-more-generic-Optio.patch
shared-add-readlink_value.patch
util-allow-strappenda-to-take-any-number-of-args.patch
journal-do-server_vacuum-for-sigusr1.patch
## Debian specific patches:
Add-back-support-for-Debian-specific-config-files.patch
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment