Merge pull request rockstor#2346 from phillxnet/2344_Reject_null_seri…

…al_disk_entries_from_database Reject null serial disk entries from database rockstor#2344
Hooverdan96 · Jan 10, 2022 · 6d0ef2a · 6d0ef2a
2 parents f10beb9 + c0ec40a
commit 6d0ef2a
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/src/rockstor/storageadmin/views/disk.py b/src/rockstor/storageadmin/views/disk.py
@@ -131,8 +131,10 @@ def _update_disk_state():
             # It makes no sense to save fake serial number drives between scans
             # as on each scan the serial number is re-generated (fake) anyway.
             # Serial numbers beginning with 'fake-serial-' are from scan_disks.
-            if (do.serial in serial_numbers_seen) or (
-                re.match("fake-serial-", do.serial) is not None
+            if (
+                (do.serial in serial_numbers_seen)
+                or (do.serial is None)
+                or (re.match("fake-serial-", do.serial) is not None)
             ):
                 logger.info(
                     "Deleting duplicate or fake (by serial) disk db "