From 27c51b2d89519d2b51e06d6d837c48e9ed11f5d6 Mon Sep 17 00:00:00 2001 From: William Grzybowski Date: Fri, 12 Apr 2019 13:46:19 -0300 Subject: [PATCH] fix(middlewared/disk): do not try to savecore on used single disk swap Ticket: NAS-101185 --- src/middlewared/middlewared/plugins/disk.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/middlewared/middlewared/plugins/disk.py b/src/middlewared/middlewared/plugins/disk.py index 1faec2b21e90..5f40a5b6edee 100644 --- a/src/middlewared/middlewared/plugins/disk.py +++ b/src/middlewared/middlewared/plugins/disk.py @@ -1323,10 +1323,12 @@ async def swaps_configure(self): # Add non-mirror swap devices # e.g. when there is a single disk - swap_devices += [ - i.devname.replace('.eli', '') - for i in getswapinfo() if not i.devname.startswith('mirror/') - ] + for i in getswapinfo(): + if i.devname.startswith('mirror/'): + continue + devname = i.devname.replace('.eli', '') + swap_devices.append(devname) + used_partitions.add(devname) # Get all partitions of swap type, indexed by size swap_partitions_by_size = defaultdict(list)