diff options
| author | Theodore Ts'o <tytso@mit.edu> | 2020-01-06 16:01:23 -0500 |
|---|---|---|
| committer | Theodore Ts'o <tytso@mit.edu> | 2020-01-06 16:01:23 -0500 |
| commit | 0b3208958eb63df6cd8b38ee63f3bc4266a683e7 (patch) | |
| tree | b8a9fa84623ad5165710b10af988384586f2a1d0 | |
| parent | d6e63732217b1db0bc915a26deda0ae5d1507fc8 (diff) | |
| download | e2fsprogs-0b3208958eb63df6cd8b38ee63f3bc4266a683e7.tar.gz | |
e2scrub, e2scrub_all: don't sleep unnecessarily in exitcode
The two second sleep is only needed in e2scrub, and when there is a
failure, so that systemd has a chance to gather the log output before
e2scrub exits. It's not needed if the script is exiting successfully,
and it's never needed for e2scrub_all ever.
Addresses-Debian-Bug: #948193
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
| -rw-r--r-- | scrub/e2scrub.in | 2 | ||||
| -rw-r--r-- | scrub/e2scrub_all.in | 8 |
2 files changed, 2 insertions, 8 deletions
diff --git a/scrub/e2scrub.in b/scrub/e2scrub.in index f21499b69..30ab7cbd1 100644 --- a/scrub/e2scrub.in +++ b/scrub/e2scrub.in @@ -66,7 +66,7 @@ exitcode() { # for capturing all the log messages if the scrub fails, because the # fail service uses the service name to gather log messages for the # error report. - if [ -n "${SERVICE_MODE}" ]; then + if [ -n "${SERVICE_MODE}" -a "${ret}" -ne 0 ]; then test "${ret}" -ne 0 && ret=1 sleep 2 fi diff --git a/scrub/e2scrub_all.in b/scrub/e2scrub_all.in index f03367115..4288b9698 100644 --- a/scrub/e2scrub_all.in +++ b/scrub/e2scrub_all.in @@ -56,14 +56,8 @@ exitcode() { # section 22.2) and hope the admin will scan the log for what # actually happened. - # We have to sleep 2 seconds here because journald uses the pid to - # connect our log messages to the systemd service. This is critical - # for capturing all the log messages if the scrub fails, because the - # fail service uses the service name to gather log messages for the - # error report. - if [ -n "${SERVICE_MODE}" ]; then + if [ -n "${SERVICE_MODE}" -a "${ret}" -ne 0 ]; then test "${ret}" -ne 0 && ret=1 - sleep 2 fi exit "${ret}" |