From 9b2c33f9daaecc593755fa6d45b6d910f8fe2f7b Mon Sep 17 00:00:00 2001 From: Theodore Ts'o Date: Thu, 11 Jul 2019 13:28:05 -0400 Subject: [PATCH] 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 --- scrub/e2scrub_all.in | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/scrub/e2scrub_all.in b/scrub/e2scrub_all.in index 24b2c68..f342faf 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 -- 1.8.3.1