repart: handle DISCARD failing with EBUSY gracefully

(cherry picked from commit 22163eb51b682afe969f9381d56315dade874ec1)
(cherry picked from commit da72383bf769e83af7ba94d51dad8ac62b5754eb)

1 files changed, 5 insertions, 0 deletions

diff --git a/src/partition/repart.c b/src/partition/repart.c
index 37fd7dcc2e..89a9574578 100644
--- a/src/partition/repart.c
+++ b/src/partition/repart.c
@@ -2251,6 +2251,11 @@ static int context_discard_partition(Context *context, Partition *p) {
                 log_info("Storage does not support discard, not discarding data in future partition %" PRIu64 ".", p->partno);
                 return 0;
         }
+        if (r == -EBUSY) {
+                /* Let's handle this gracefully: https://bugzilla.kernel.org/show_bug.cgi?id=211167 */
+                log_info("Block device is busy, not discarding partition %" PRIu64 " because it probably is mounted.", p->partno);
+                return 0;
+        }
         if (r == 0) {
                 log_info("Partition %" PRIu64 " too short for discard, skipping.", p->partno);
                 return 0;