korg/e2fsprogs
0
0
Fork 0
mirror of https://git.kernel.org/pub/scm/fs/ext2/e2fsprogs.git synced 2024-11-23 18:14:25 +08:00
Code Issues Packages Projects Releases Wiki Activity

e2scrub: remove -C from e2scrub_all

Browse Source 
We already have the "SERVICE_MODE=1" feature that signals to e2scrub
that we're running as a background daemon and therefore we should exit
quietly if conditions aren't right.

It's therefore unnecessary to have a separate -C flag to achieve the
same outcome for cron jobs.  Merge the two together.

Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
This commit is contained in:
Darrick J. Wong 2019-06-03 21:27:12 -07:00 committed by Theodore Ts'o
parent cc035a95a2
commit 6ec2060a29
5 changed files with 9 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
scrub/e2scrub_all.cron.in
View File

@ -1,2 +1,2 @@
30 3 * * 0 root test -e /run/systemd/system || @pkglibdir@/e2scrub_all_cron
10 3 * * * root test -e /run/systemd/system || @root_sbindir@/e2scrub_all -C -A -r
30 3 * * 0 root test -e /run/systemd/system || SERVICE_MODE=1 @pkglibdir@/e2scrub_all_cron
10 3 * * * root test -e /run/systemd/system || SERVICE_MODE=1 @root_sbindir@/e2scrub_all -A -r

12
scrub/e2scrub_all.in
View File

@ -26,7 +26,6 @@ if (( $EUID != 0 )); then
fi
scrub_all=0
run_from_cron=0
snap_size_mb=256
reap=0
conffile="@root_sysconfdir@/e2scrub.conf"
@ -69,12 +68,11 @@ exitcode() {
exit "${ret}"
}
while getopts "nrACV" opt; do
while getopts "nrAV" opt; do
case "${opt}" in
"n") DBG="echo Would execute: " ;;
"r") scrub_args="${scrub_args} -r"; reap=1;;
"A") scrub_all=1;;
"C") run_from_cron=1;;
"V") print_version; exitcode 0;;
*) print_help; exitcode 2;;
esac
@ -86,17 +84,13 @@ shift "$((OPTIND - 1))"
# when e2scrub_all is run out of cron or a systemd timer.
if ! type lsblk >& /dev/null ; then
if [ "${run_from_cron}" -eq 1 ] ; then
exitcode 0
fi
test -n "${SERVICE_MODE}" && exitcode 0
echo "e2scrub_all: can't find lsblk --- is util-linux installed?"
exitcode 1
fi
if ! type lvcreate >& /dev/null ; then
if [ "${run_from_cron}" -eq 1 ] ; then
exitcode 0
fi
test -n "${SERVICE_MODE}" && exitcode 0
echo "e2scrub_all: can't find lvcreate --- is lvm2 installed?"
exitcode 1
fi

2
scrub/e2scrub_all.service.in
View File

@ -8,5 +8,5 @@ Documentation=man:e2scrub_all(8)
[Service]
Type=oneshot
Environment=SERVICE_MODE=1
ExecStart=@root_sbindir@/e2scrub_all -C
ExecStart=@root_sbindir@/e2scrub_all
SyslogIdentifier=e2scrub_all

2
scrub/e2scrub_all_cron.in
View File

@ -65,4 +65,4 @@ on_ac_power() {
test -e /run/systemd/system && exit 0
on_ac_power || exit 0
exec @root_sbindir@/e2scrub_all -C
exec @root_sbindir@/e2scrub_all

3
scrub/e2scrub_reap.service.in
View File

@ -16,7 +16,8 @@ NoNewPrivileges=yes
User=root
IOSchedulingClass=idle
CPUSchedulingPolicy=idle
ExecStart=@root_sbindir@/e2scrub_all -C -A -r
Environment=SERVICE_MODE=1
ExecStart=@root_sbindir@/e2scrub_all -A -r
SyslogIdentifier=%N
RemainAfterExit=no