cryptsetup: try to detach the device multiple times before giving up

Terrible hack for RHEL8. We are missing the [email protected], so we can't correctly express some dependencies. That means when systemd-cryptsetup detach can fail, because for example a filesystem is still mounted on top of the device. This can cause shutdown to hang forever. See https://issues.redhat.com/browse/RHEL-6210 So as a workaround, let's try to detach the device multiple times before giving up. Proper fix is systemd/systemd@44b0d1f RHEL-only Resolves: RHEL-6210
redhat-plumbers · Feb 14, 2024 · cdf70e6 · cdf70e6
1 parent 8bf7a6f
commit cdf70e6
Showing 1 changed file with 12 additions and 1 deletion.
diff --git a/src/cryptsetup/cryptsetup.c b/src/cryptsetup/cryptsetup.c
@@ -772,7 +772,18 @@ int main(int argc, char *argv[]) {
 
                 crypt_set_log_callback(cd, cryptsetup_log_glue, NULL);
 
-                r = crypt_deactivate(cd, argv[2]);
+                /* Terrible hack for RHEL8. We are missing the [email protected], so we can't
+                 correctly express some dependencies. That means when systemd-cryptsetup detach
+                can fail, because for example a filesystem is still mounted on top of the device.
+                This can cause shutdown to hang forever. See https://issues.redhat.com/browse/RHEL-6210
+                So as a workaround, let's try to detach the device multiple times before giving up. */
+                for (int i = 0; i < 10; i++) {
+                        r = crypt_deactivate(cd, argv[2]);
+                        if (r == 0)
+                                break;
+                        sleep(1);
+                }
+
                 if (r < 0) {
                         log_error_errno(r, "Failed to deactivate: %m");
                         goto finish;