diff options
| author | Theodore Ts'o <tytso@mit.edu> | 2019-07-11 13:28:05 -0400 |
|---|---|---|
| committer | Theodore Ts'o <tytso@mit.edu> | 2019-07-11 17:47:07 -0400 |
| commit | 9b2c33f9daaecc593755fa6d45b6d910f8fe2f7b (patch) | |
| tree | 87bf1218ffbc437611b90f76595a47bcba43ae99 /scrub/e2scrub_all.in | |
| parent | 71b499538b24738c8af985849f611bc7e4f56321 (diff) | |
| download | e2fsprogs-9b2c33f9daaecc593755fa6d45b6d910f8fe2f7b.tar.gz | |
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>
Diffstat (limited to 'scrub/e2scrub_all.in')
| -rw-r--r-- | scrub/e2scrub_all.in | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/scrub/e2scrub_all.in b/scrub/e2scrub_all.in index 24b2c681..f342faf2 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 |