RomanNum3ral
/
archinstall
mirror of https://github.com/archlinux/archinstall.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix error at end of installation from missing method import

This commit is contained in:
Dylan Taylor 2021-11-23 15:27:02 -05:00
parent 72d02a391d
commit 04c2b19dbe
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
archinstall/__init__.py
View File

@ -8,7 +8,7 @@ from .lib.disk import *
from .lib.exceptions import * from .lib.exceptions import *
from .lib.general import * from .lib.general import *
from .lib.hardware 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.locale_helpers import *
from .lib.luks import * from .lib.luks import *
from .lib.mirrors import * from .lib.mirrors import *
@ -50,14 +50,14 @@ def initialize_arguments():
config = json.loads(response.read()) config = json.loads(response.read())
except Exception as e: except Exception as e:
raise ValueError(f"Could not load --config because: {e}") raise ValueError(f"Could not load --config because: {e}")
if args.creds is not None: if args.creds is not None:
with open(args.creds) as file: with open(args.creds) as file:
config.update(json.load(file)) config.update(json.load(file))
# Installation can't be silent if config is not passed # Installation can't be silent if config is not passed
config["silent"] = args.silent config["silent"] = args.silent
for arg in unknowns: for arg in unknowns:
if '--' == arg[:2]: if '--' == arg[:2]:
if '=' in arg: if '=' in arg:
@ -65,9 +65,9 @@ def initialize_arguments():
else: else:
key, val = arg[2:], True key, val = arg[2:], True
config[key] = val config[key] = val
config["script"] = args.script config["script"] = args.script
if args.dry_run is not None: if args.dry_run is not None:
config["dry-run"] = args.dry_run config["dry-run"] = args.dry_run

2
examples/guided.py
View File

@ -334,7 +334,7 @@ def perform_installation(mountpoint):
if archinstall.arguments.get('ntp', False): if archinstall.arguments.get('ntp', False):
installation.activate_time_syncronization() installation.activate_time_syncronization()
if installation.accessibility_tools_in_use(): if archinstall.accessibility_tools_in_use():
installation.enable_espeakup() installation.enable_espeakup()
if (root_pw := archinstall.arguments.get('!root-password', None)) and len(root_pw): if (root_pw := archinstall.arguments.get('!root-password', None)) and len(root_pw):