disk: move ENC_IDENTIFIER (#3034)

archlinux · Dec 21, 2024 · c978c84 · c978c84
1 parent 9b5fd6b
commit c978c84
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/archinstall/lib/disk/device_model.py b/archinstall/lib/disk/device_model.py
@@ -24,6 +24,9 @@
 	_: Callable[[str], DeferredTranslation]
 
 
+ENC_IDENTIFIER = 'ainst'
+
+
 class DiskLayoutType(Enum):
 	Default = 'default_layout'
 	Manual = 'manual_partitioning'
@@ -919,7 +922,7 @@ def is_create_or_modify(self) -> bool:
 	@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 @@ def obj_id(self) -> str:
 	@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
@@ -13,5 +13,4 @@
 	'LOG_PATH': Path('/var/log/archinstall'),
 	'LOG_FILE': Path('install.log'),
 	'MOUNT_POINT': Path('/mnt/archinstall'),
-	'ENC_IDENTIFIER': 'ainst',
 }