Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
path: root/archinstall/lib/storage.py
diff options
context:
space:
mode:
Diffstat (limited to 'archinstall/lib/storage.py')
-rw-r--r--archinstall/lib/storage.py19
1 files changed, 6 insertions, 13 deletions
diff --git a/archinstall/lib/storage.py b/archinstall/lib/storage.py
index 8c358161..5a54d816 100644
--- a/archinstall/lib/storage.py
+++ b/archinstall/lib/storage.py
@@ -1,26 +1,19 @@
-import os
-
# There's a few scenarios of execution:
-# 1. In the git repository, where ./profiles/ exist
+# 1. In the git repository, where ./profiles_bck/ exist
# 2. When executing from a remote directory, but targeted a script that starts from the git repository
-# 3. When executing as a python -m archinstall module where profiles exist one step back for library reasons.
+# 3. When executing as a python -m archinstall module where profiles_bck exist one step back for library reasons.
# (4. Added the ~/.config directory as an additional option for future reasons)
#
# And Keeping this in dict ensures that variables are shared across imports.
from typing import Any, Dict
+from pathlib import Path
+
storage: Dict[str, Any] = {
- 'PROFILE_PATH': [
- './profiles',
- '~/.config/archinstall/profiles',
- os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__file__))), 'profiles'),
- # os.path.abspath(f'{os.path.dirname(__file__)}/../examples')
- ],
- 'UPSTREAM_URL': 'https://raw.githubusercontent.com/archlinux/archinstall/master/profiles',
- 'PROFILE_DB': None, # Used in cases when listing profiles is desired, not mandatory for direct profile grabbing.
+ 'PROFILE': Path(__file__).parent.parent.joinpath('default_profiles'),
'LOG_PATH': '/var/log/archinstall',
'LOG_FILE': 'install.log',
- 'MOUNT_POINT': '/mnt/archinstall',
+ 'MOUNT_POINT': Path('/mnt/archinstall'),
'ENC_IDENTIFIER': 'ainst',
'DISK_TIMEOUTS' : 1, # seconds
'DISK_RETRY_ATTEMPTS' : 5, # RETRY_ATTEMPTS * DISK_TIMEOUTS is used in disk operations