summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorColin Watson <cjwatson@debian.org>2023-09-19 14:02:48 +0100
committerColin Watson <cjwatson@debian.org>2023-09-19 14:02:48 +0100
commitef9baff127890d83dab3d7e0a8c9c8ab7c5e9b55 (patch)
tree074c9fab305b4e0959baa6514518e2852f3c5f3d
parentb403f6d413e2b01993de56906bd28480882badb6 (diff)
systemd: Avoid duplicate cleanup of old cat pages
Thanks to Ferenc Wágner. Fixes https://bugs.debian.org/1052221. * init/systemd/man-db.service.in: Remove call to `find`; this is already handled equivalently by `init/systemd/man-db.conf.in`, and having both can result in error messages due to the two cleanups running concurrently. * NEWS.md: Document this.
-rw-r--r--NEWS.md2
-rw-r--r--init/systemd/man-db.service.in2
2 files changed, 2 insertions, 2 deletions
diff --git a/NEWS.md b/NEWS.md
index 9ab0ddf1..d3b0a36d 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -11,6 +11,8 @@ Fixes:
for guessing `MANPATH` entries.
* More accurately document the behaviour of passing file names as arguments
to `man` without the `-l`/`--local-file` option.
+ * Avoid duplicate cleanup of old cat pages by both `man-db.service` and
+ `systemd-tmpfiles-clean.service`.
Improvements:
diff --git a/init/systemd/man-db.service.in b/init/systemd/man-db.service.in
index 7115f414..2d2877bf 100644
--- a/init/systemd/man-db.service.in
+++ b/init/systemd/man-db.service.in
@@ -7,8 +7,6 @@ ConditionACPower=true
Type=oneshot
# Recover from deletion, per FHS.
ExecStart=+/usr/bin/install -d -o @cache_top_owner@ -g @cache_top_owner@ -m 0755 /var/cache/man
-# Expunge old catman pages which have not been read in a week.
-ExecStart=/usr/bin/find /var/cache/man -type f -name *.gz -atime +6 -delete
# Regenerate man database.
ExecStart=@bindir@/mandb --quiet
User=@cache_top_owner@