From 6c3f94868e5d1447d698f66535057f8d8b5b592a Mon Sep 17 00:00:00 2001
From: codefiles <11915375+codefiles@users.noreply.github.com>
Date: Sun, 15 Feb 2026 21:23:56 -0500
Subject: [PATCH] Move swapon() to disk.utils

---
 archinstall/lib/disk/device_handler.py | 7 -------
 archinstall/lib/disk/utils.py          | 7 +++++++
 archinstall/lib/installer.py           | 4 ++--
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/archinstall/lib/disk/device_handler.py b/archinstall/lib/disk/device_handler.py
index cef0ac4cfc..ce0fd759c8 100644
--- a/archinstall/lib/disk/device_handler.py
+++ b/archinstall/lib/disk/device_handler.py
@@ -763,13 +763,6 @@ def partition(
 		if filtered_part:
 			self.udev_sync()
 
-	@staticmethod
-	def swapon(path: Path) -> None:
-		try:
-			SysCommand(['swapon', str(path)])
-		except SysCallError as err:
-			raise DiskError(f'Could not enable swap {path}:\n{err.message}')
-
 	def detect_pre_mounted_mods(self, base_mountpoint: Path) -> list[DeviceModification]:
 		part_mods: dict[Path, list[PartitionModification]] = {}
 
diff --git a/archinstall/lib/disk/utils.py b/archinstall/lib/disk/utils.py
index d1402fb6f1..4941e0757e 100644
--- a/archinstall/lib/disk/utils.py
+++ b/archinstall/lib/disk/utils.py
@@ -163,3 +163,10 @@ def umount(mountpoint: Path, recursive: bool = False) -> None:
 	for path in lsblk_info.mountpoints:
 		debug(f'Unmounting mountpoint: {path}')
 		SysCommand(cmd + [str(path)])
+
+
+def swapon(path: Path) -> None:
+	try:
+		SysCommand(['swapon', str(path)])
+	except SysCallError as err:
+		raise DiskError(f'Could not enable swap {path}:\n{err.message}')
diff --git a/archinstall/lib/installer.py b/archinstall/lib/installer.py
index 8fb20cfa11..f59f23fa5b 100644
--- a/archinstall/lib/installer.py
+++ b/archinstall/lib/installer.py
@@ -16,7 +16,7 @@
 
 from archinstall.lib.disk.device_handler import device_handler
 from archinstall.lib.disk.fido import Fido2
-from archinstall.lib.disk.utils import get_lsblk_by_mountpoint, get_lsblk_info, mount
+from archinstall.lib.disk.utils import get_lsblk_by_mountpoint, get_lsblk_info, mount, swapon
 from archinstall.lib.models.application import ZramAlgorithm
 from archinstall.lib.models.device import (
 	DiskEncryption,
@@ -371,7 +371,7 @@ def _mount_partition(self, part_mod: PartitionModification) -> None:
 					part_mod.mount_options,
 				)
 		elif part_mod.is_swap():
-			device_handler.swapon(part_mod.dev_path)
+			swapon(part_mod.dev_path)
 
 	def _mount_lvm_vol(self, volume: LvmVolume) -> None:
 		if volume.fs_type != FilesystemType.Btrfs: