From c978c841de143ca9ad07ff7bd7dc51f19ee0ecbf Mon Sep 17 00:00:00 2001 From: codefiles <11915375+codefiles@users.noreply.github.com> Date: Sat, 21 Dec 2024 18:21:21 -0500 Subject: [PATCH] disk: move ENC_IDENTIFIER (#3034) --- archinstall/lib/disk/device_model.py | 7 +++++-- archinstall/lib/storage.py | 1 - 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/archinstall/lib/disk/device_model.py b/archinstall/lib/disk/device_model.py index b867c0c3..fdbfb3ba 100644 --- a/archinstall/lib/disk/device_model.py +++ b/archinstall/lib/disk/device_model.py @@ -24,6 +24,9 @@ if TYPE_CHECKING: _: Callable[[str], DeferredTranslation] +ENC_IDENTIFIER = 'ainst' + + class DiskLayoutType(Enum): Default = 'default_layout' Manual = 'manual_partitioning' @@ -919,7 +922,7 @@ class PartitionModification: @property def mapper_name(self) -> str | None: if self.dev_path: - return f'{storage.get("ENC_IDENTIFIER", "ai")}{self.dev_path.name}' + return f'{ENC_IDENTIFIER}{self.dev_path.name}' return None def set_flag(self, flag: PartitionFlag) -> None: @@ -1076,7 +1079,7 @@ class LvmVolume: @property def mapper_name(self) -> str | None: if self.dev_path: - return f'{storage.get("ENC_IDENTIFIER", "ai")}{self.safe_dev_path.name}' + return f'{ENC_IDENTIFIER}{self.safe_dev_path.name}' return None @property diff --git a/archinstall/lib/storage.py b/archinstall/lib/storage.py index 21500dfa..3eafab7d 100644 --- a/archinstall/lib/storage.py +++ b/archinstall/lib/storage.py @@ -13,5 +13,4 @@ storage: dict[str, Any] = { 'LOG_PATH': Path('/var/log/archinstall'), 'LOG_FILE': Path('install.log'), 'MOUNT_POINT': Path('/mnt/archinstall'), - 'ENC_IDENTIFIER': 'ainst', }