Merge pull request #678 from archlinux/torxed-fix-175

Adding support for swap on zram

3 files changed, 4 insertions, 7 deletions

diff --git a/archinstall/lib/disk/blockdevice.py b/archinstall/lib/disk/blockdevice.py
index fad04c7b..f80f57f3 100644
--- a/archinstall/lib/disk/blockdevice.py
+++ b/archinstall/lib/disk/blockdevice.py
@@ -1,10 +1,7 @@
-# flake8: noqa
-# The above ignore, see issue: https://github.com/archlinux/archinstall/pull/650#issuecomment-961995949
 import os
 import json
 import logging
-from .exceptions import DiskError
-from .helpers import all_disks
+from ..exceptions import DiskError
 from ..output import log
 from ..general import SysCommand
 
diff --git a/archinstall/lib/disk/filesystem.py b/archinstall/lib/disk/filesystem.py
index 69593d08..ac3c9d17 100644
--- a/archinstall/lib/disk/filesystem.py
+++ b/archinstall/lib/disk/filesystem.py
@@ -1,9 +1,9 @@
 import time
 import logging
 import json
-from .exceptions import DiskError
 from .partition import Partition
 from .validators import valid_fs_type
+from ..exceptions import DiskError
 from ..general import SysCommand
 from ..output import log
 from ..storage import storage
diff --git a/archinstall/lib/disk/partition.py b/archinstall/lib/disk/partition.py
index afe46db3..a459a820 100644
--- a/archinstall/lib/disk/partition.py
+++ b/archinstall/lib/disk/partition.py
@@ -7,9 +7,9 @@ import os
 import hashlib
 from typing import Optional
 from .blockdevice import BlockDevice
-from .exceptions import DiskError, SysCallError, UnknownFilesystemFormat
 from .helpers import get_mount_info, get_filesystem_type
-from .storage import storage
+from ..storage import storage
+from ..exceptions import DiskError, SysCallError, UnknownFilesystemFormat
 from ..output import log
 from ..general import SysCommand