From deb53f0658e6e66efa3a437c2fbd9fd30860f421 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julian=20Frohm=C3=BCller?= <admin@socialz.de>
Date: Wed, 15 Jan 2025 21:17:08 +0100
Subject: [PATCH] Fix restore_usb_mass_storage_ccc

---
 src/opensuperclone/opensuperclone.c | 48 +++++++++++++++++++++++++++++
 1 file changed, 48 insertions(+)

diff --git a/src/opensuperclone/opensuperclone.c b/src/opensuperclone/opensuperclone.c
index 636424e..5894361 100644
--- a/src/opensuperclone/opensuperclone.c
+++ b/src/opensuperclone/opensuperclone.c
@@ -15590,6 +15590,30 @@ void restore_usb_mass_storage_ccc(void)
         return;
       }
     }
+    else if (access("/lib/modules/$(uname -r)/kernel/drivers/usb/storage/usb-storage.ko.xz.blacklist", F_OK))
+    {
+      if (system("mv -fv /lib/modules/$(uname -r)/kernel/drivers/usb/storage/usb-storage.ko.xz.blacklist /lib/modules/$(uname -r)/kernel/drivers/usb/storage/usb-storage.ko.xz"))
+      {
+        // error copying
+        snprintf(tempmessage_ccc, TEMP_MESSAGE_SIZE, "%s%s", _("Error: File moving failed"), "\nmv -fv /lib/modules/$(uname -r)/kernel/drivers/usb/storage/usb-storage.ko.xz.blacklist /lib/modules/$(uname -r)/kernel/drivers/usb/storage/usb-storage.ko.xz");
+        message_error_ccc(tempmessage_ccc);
+        print_gui_error_message_ccc(error_message_ccc, _("Error!"), 1);
+        clear_error_message_ccc();
+        return;
+      }
+    }
+    else if (access("/lib/modules/$(uname -r)/kernel/drivers/usb/storage/usb-storage.ko.zst.blacklist", F_OK))
+    {
+      if (system("mv -fv /lib/modules/$(uname -r)/kernel/drivers/usb/storage/usb-storage.ko.zst.blacklist /lib/modules/$(uname -r)/kernel/drivers/usb/storage/usb-storage.ko.zst"))
+      {
+        // error copying
+        snprintf(tempmessage_ccc, TEMP_MESSAGE_SIZE, "%s%s", _("Error: File moving failed"), "\nmv -fv /lib/modules/$(uname -r)/kernel/drivers/usb/storage/usb-storage.ko.zst.blacklist /lib/modules/$(uname -r)/kernel/drivers/usb/storage/usb-storage.ko.zst");
+        message_error_ccc(tempmessage_ccc);
+        print_gui_error_message_ccc(error_message_ccc, _("Error!"), 1);
+        clear_error_message_ccc();
+        return;
+      }
+    }
 
     if (access("/lib/modules/$(uname -r)/kernel/drivers/usb/storage/uas.ko.blacklist", F_OK))
     {
@@ -15603,6 +15627,30 @@ void restore_usb_mass_storage_ccc(void)
         return;
       }
     }
+    else if (access("/lib/modules/$(uname -r)/kernel/drivers/usb/storage/uas.ko.xz.blacklist", F_OK))
+    {
+      if (system("mv -fv /lib/modules/$(uname -r)/kernel/drivers/usb/storage/uas.ko.xz.blacklist /lib/modules/$(uname -r)/kernel/drivers/usb/storage/uas.ko.xz"))
+      {
+        // error copying
+        snprintf(tempmessage_ccc, TEMP_MESSAGE_SIZE, "%s%s", _("Error: File moving failed"), "\nmv -fv /lib/modules/$(uname -r)/kernel/drivers/usb/storage/uas.ko.xz.blacklist /lib/modules/$(uname -r)/kernel/drivers/usb/storage/uas.ko.xz");
+        message_error_ccc(tempmessage_ccc);
+        print_gui_error_message_ccc(error_message_ccc, _("Error!"), 1);
+        clear_error_message_ccc();
+        return;
+      }
+    }
+    else if (access("/lib/modules/$(uname -r)/kernel/drivers/usb/storage/uas.ko.zst.blacklist", F_OK))
+    {
+      if (system("mv -fv /lib/modules/$(uname -r)/kernel/drivers/usb/storage/uas.ko.zst.blacklist /lib/modules/$(uname -r)/kernel/drivers/usb/storage/uas.ko.zst"))
+      {
+        // error copying
+        snprintf(tempmessage_ccc, TEMP_MESSAGE_SIZE, "%s%s", _("Error: File moving failed"), "\nmv -fv /lib/modules/$(uname -r)/kernel/drivers/usb/storage/uas.ko.zst.blacklist /lib/modules/$(uname -r)/kernel/drivers/usb/storage/uas.ko.zst");
+        message_error_ccc(tempmessage_ccc);
+        print_gui_error_message_ccc(error_message_ccc, _("Error!"), 1);
+        clear_error_message_ccc();
+        return;
+      }
+    }
 
     snprintf(tempmessage_ccc, TEMP_MESSAGE_SIZE, _("Operation completed successfully\n"));
     message_error_ccc(tempmessage_ccc);