some touch-ups

src/middlewared/middlewared/plugins/disk_/format.py

@@ -46,7 +46,7 @@ def format(self, disk, swap_size_gb=None):
         part.name = 'data'  # give a human readable name to the label
         parted_disk.addPartition(part, constraint=dev.optimalAlignedConstraint)
         parted_disk.commit()
-        if len(self.middleware.call_sync('disk.list_partitions', disk)) != len(parted_disk.partitions):
+        if len(self.middleware.call_sync('disk.get_partitions_quick', disk)) != len(parted_disk.partitions):
             # In some rare cases udev does not re-read the partition table correctly; force it
             self.middleware.call_sync('device.trigger_udev_events', f'/dev/{disk}')
             self.middleware.call_sync('device.settle_udev_events')

src/middlewared/middlewared/plugins/pool_/format_disks.py

@@ -9,18 +9,15 @@ async def format_disks(self, job, disks):
         """
         Format all disks, putting all ZFS partitions created into their respective vdevs.
         """
-        # Make sure all SED disks are unlocked
         await self.middleware.call('disk.sed_unlock_all')
-        swapgb = (await self.middleware.call('system.advanced.config'))['swapondrive']
-        formatted = 0
         await self.middleware.call('pool.remove_unsupported_md_devices_from_disks', disks)
-        len_disks = len(disks)
 
+        formatted = 0
+        len_disks = len(disks)
         async def format_disk(arg):
             nonlocal formatted
             disk, config = arg
-            # Drives are partitioned to maximize the data partition
-            await self.middleware.call('disk.format', disk, 0)
+            await self.middleware.call('disk.format', disk)
             formatted += 1
             job.set_progress(15, f'Formatting disks ({formatted}/{len_disks})')