Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
path: root/examples/guided.py
diff options
context:
space:
mode:
authorWerner Llácer <wllacer@gmail.com>2022-02-04 23:48:41 +0100
committerGitHub <noreply@github.com>2022-02-04 23:48:41 +0100
commit85f2938df9e7e34a08fd1b1acc7c8b41d14ccb54 (patch)
treeffdcdaf079861d6beb45307b94447c3b8851411f /examples/guided.py
parent7fda1e42a41471353608a11ceb42c6949ef3d8a5 (diff)
Moving load_config from guided to \__init__.py (#887)
* The initializations done at the start of guided.py are now at archinstall/__init__.py The scripts have been changed accordingly * Correct definition of btrfs standard layout Co-authored-by: Anton Hvornum <anton@hvornum.se>
Diffstat (limited to 'examples/guided.py')
-rw-r--r--examples/guided.py29
1 files changed, 0 insertions, 29 deletions
diff --git a/examples/guided.py b/examples/guided.py
index 9071ce39..e14e58cf 100644
--- a/examples/guided.py
+++ b/examples/guided.py
@@ -22,34 +22,6 @@ archinstall.log(f"Graphics devices detected: {archinstall.graphics_devices().key
# For support reasons, we'll log the disk layout pre installation to match against post-installation layout
archinstall.log(f"Disk states before installing: {archinstall.disk_layouts()}", level=logging.DEBUG)
-def load_config():
- if archinstall.arguments.get('harddrives', None) is not None:
- if type(archinstall.arguments['harddrives']) is str:
- archinstall.arguments['harddrives'] = archinstall.arguments['harddrives'].split(',')
- archinstall.arguments['harddrives'] = [archinstall.BlockDevice(BlockDev) for BlockDev in archinstall.arguments['harddrives']]
- # Temporarily disabling keep_partitions if config file is loaded
- # Temporary workaround to make Desktop Environments work
- if archinstall.arguments.get('profile', None) is not None:
- if type(archinstall.arguments.get('profile', None)) is dict:
- archinstall.arguments['profile'] = archinstall.Profile(None, archinstall.arguments.get('profile', None)['path'])
- else:
- archinstall.arguments['profile'] = archinstall.Profile(None, archinstall.arguments.get('profile', None))
- archinstall.storage['_desktop_profile'] = archinstall.arguments.get('desktop-environment', None)
- if archinstall.arguments.get('mirror-region', None) is not None:
- if type(archinstall.arguments.get('mirror-region', None)) is dict:
- archinstall.arguments['mirror-region'] = archinstall.arguments.get('mirror-region', None)
- else:
- selected_region = archinstall.arguments.get('mirror-region', None)
- archinstall.arguments['mirror-region'] = {selected_region: archinstall.list_mirrors()[selected_region]}
- if archinstall.arguments.get('sys-language', None) is not None:
- archinstall.arguments['sys-language'] = archinstall.arguments.get('sys-language', 'en_US')
- if archinstall.arguments.get('sys-encoding', None) is not None:
- archinstall.arguments['sys-encoding'] = archinstall.arguments.get('sys-encoding', 'utf-8')
- if archinstall.arguments.get('gfx_driver', None) is not None:
- archinstall.storage['gfx_driver_packages'] = archinstall.AVAILABLE_GFX_DRIVERS.get(archinstall.arguments.get('gfx_driver', None), None)
- if archinstall.arguments.get('servers', None) is not None:
- archinstall.storage['_selected_servers'] = archinstall.arguments.get('servers', None)
-
def ask_user_questions():
"""
@@ -325,7 +297,6 @@ if not archinstall.arguments.get('offline', False):
archinstall.log(f"Failed to update the keyring. Please check your internet connection and the log file '{log_file}'.", level=logging.INFO, fg="red")
exit(1)
-load_config()
if not archinstall.arguments.get('silent'):
ask_user_questions()