From: Samuel Smith <satlug@net153.net>
Date: Sat, 28 Jun 2025 05:14:15 +0000 (-0500)
Subject: e2scrub: honor fstrim setting in e2scrub.conf
X-Git-Tag: v1.47.3-rc3~7
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1b11e079a6189a49d7a13c01c13d222c8537cc1e;p=thirdparty%2Fe2fsprogs.git

e2scrub: honor fstrim setting in e2scrub.conf

The systemd service unconditionally passes -t to e2scrub, forcing
fstrim to run after every scrub regardless of the fstrim setting
in /etc/e2scrub.conf. Removing the hardcoded flag will allow users to
control the behavior via the configuration file.

Signed-off-by: Samuel Smith <satlug@net153.net>
Reviewed-by: Darrick J. Wong <djwong@kernel.org>
Link: https://lore.kernel.org/r/20250628051415.3015410-1-satlug@net153.net
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
---

diff --git a/scrub/e2scrub@.service.in b/scrub/e2scrub@.service.in
index 6425263c..3c9893c5 100644
--- a/scrub/e2scrub@.service.in
+++ b/scrub/e2scrub@.service.in
@@ -16,5 +16,5 @@ User=root
 IOSchedulingClass=idle
 CPUSchedulingPolicy=idle
 Environment=SERVICE_MODE=1
-ExecStart=@root_sbindir@/e2scrub -t %f
+ExecStart=@root_sbindir@/e2scrub %f
 SyslogIdentifier=%N