From: Theodore Ts'o <tytso@mit.edu>
Date: Thu, 11 Jul 2019 17:28:05 +0000 (-0400)
Subject: e2scrub_all: fix "e2scurb_all -r"
X-Git-Tag: v1.45.3~18
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9b2c33f9daaecc593755fa6d45b6d910f8fe2f7b;p=thirdparty%2Fe2fsprogs.git

e2scrub_all: fix "e2scurb_all -r"

The e2scrub_all program was broken by commit c7d6525ecaab
("e2scrub_all: refactor device probe loop") so that it would use the
path of the snapshot volume instead of the base volume.  This caused
"e2scrub_all -r" to pass the wrong pathname to e2scrub, with the
result that e2scrub would abort with an error instead of removing the
snapshot volume.

Fixes: c7d6525ecaab ("e2scrub_all: refactor device probe loop")
Addresses-Debian-Bug: #931679
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
---

diff --git a/scrub/e2scrub_all.in b/scrub/e2scrub_all.in
index 24b2c6810..f342faf2d 100644
--- a/scrub/e2scrub_all.in
+++ b/scrub/e2scrub_all.in
@@ -115,7 +115,8 @@ ls_scan_targets() {
 
 # Find leftover scrub snapshots
 ls_reap_targets() {
-	lvs -o lv_path -S lv_role=snapshot -S lv_name=~\(e2scrub$\) --noheadings
+    lvs -o lv_path -S lv_role=snapshot -S lv_name=~\(e2scrub$\) \
+	--noheadings | sed -e 's/.e2scrub$//'
 }
 
 # Figure out what we're targeting