| index : archinstall32 | |
| Archlinux32 installer | gitolite user |
| summaryrefslogtreecommitdiff |
| -rw-r--r-- | archinstall/__init__.py | 12 | ||||
| -rw-r--r-- | examples/guided.py | 2 |
diff --git a/archinstall/__init__.py b/archinstall/__init__.py index a528922f..c66393ad 100644 --- a/archinstall/__init__.py +++ b/archinstall/__init__.py @@ -8,7 +8,7 @@ from .lib.disk import * from .lib.exceptions import * from .lib.general import * from .lib.hardware import * -from .lib.installer import __packages__, Installer +from .lib.installer import __packages__, Installer, accessibility_tools_in_use from .lib.locale_helpers import * from .lib.luks import * from .lib.mirrors import * @@ -50,14 +50,14 @@ def initialize_arguments(): config = json.loads(response.read()) except Exception as e: raise ValueError(f"Could not load --config because: {e}") - + if args.creds is not None: with open(args.creds) as file: config.update(json.load(file)) - + # Installation can't be silent if config is not passed config["silent"] = args.silent - + for arg in unknowns: if '--' == arg[:2]: if '=' in arg: @@ -65,9 +65,9 @@ def initialize_arguments(): else: key, val = arg[2:], True config[key] = val - + config["script"] = args.script - + if args.dry_run is not None: config["dry-run"] = args.dry_run diff --git a/examples/guided.py b/examples/guided.py index e58fd56b..4e90ec54 100644 --- a/examples/guided.py +++ b/examples/guided.py @@ -334,7 +334,7 @@ def perform_installation(mountpoint): if archinstall.arguments.get('ntp', False): installation.activate_time_syncronization() - if installation.accessibility_tools_in_use(): + if archinstall.accessibility_tools_in_use(): installation.enable_espeakup() if (root_pw := archinstall.arguments.get('!root-password', None)) and len(root_pw): |