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

Always verify permissions and check for log dir (#1874) 

Co-authored-by: Daniel Girtler <girtler.daniel@gmail.com>
This commit is contained in:
Daniel Girtler 2023-06-21 17:47:30 +10:00 committed by GitHub
parent 03d228fee8
commit 1b5ecb65aa
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
archinstall/__init__.py
View File

@ -20,10 +20,7 @@ from . import default_profiles
from .lib.hardware import SysInfo, AVAILABLE_GFX_DRIVERS from .lib.hardware import SysInfo, AVAILABLE_GFX_DRIVERS
from .lib.installer import Installer, accessibility_tools_in_use from .lib.installer import Installer, accessibility_tools_in_use
from .lib.output import ( from .lib.output import FormattedOutput, log, error, debug, warn, info
FormattedOutput, log, error,
check_log_permissions, debug, warn, info
)
from .lib.storage import storage from .lib.storage import storage
from .lib.global_menu import GlobalMenu from .lib.global_menu import GlobalMenu
from .lib.boot import Boot from .lib.boot import Boot
@ -50,8 +47,6 @@ storage['__version__'] = __version__
# project to mark strings as translatable with _('translate me') # project to mark strings as translatable with _('translate me')
DeferredTranslation.install() DeferredTranslation.install()
check_log_permissions()
# Log various information about hardware before starting the installation. This might assist in troubleshooting # Log various information about hardware before starting the installation. This might assist in troubleshooting
debug(f"Hardware model detected: {SysInfo.sys_vendor()} {SysInfo.product_name()}; UEFI mode: {SysInfo.has_uefi()}") debug(f"Hardware model detected: {SysInfo.sys_vendor()} {SysInfo.product_name()}; UEFI mode: {SysInfo.has_uefi()}")
debug(f"Processor model detected: {SysInfo.cpu_model()}") debug(f"Processor model detected: {SysInfo.cpu_model()}")

6
archinstall/lib/output.py
View File

@ -135,7 +135,7 @@ class Journald:
log_adapter.log(level, message) log_adapter.log(level, message)
def check_log_permissions(): def _check_log_permissions():
filename = storage.get('LOG_FILE', None) filename = storage.get('LOG_FILE', None)
log_dir = storage.get('LOG_PATH', Path('./')) log_dir = storage.get('LOG_PATH', Path('./'))
@ -292,6 +292,10 @@ def log(
reset: bool = False, reset: bool = False,
font: List[Font] = [] font: List[Font] = []
): ):
# leave this check here as we need to setup the logging
# right from the beginning when the modules are loaded
_check_log_permissions()
text = orig_string = ' '.join([str(x) for x in msgs]) text = orig_string = ' '.join([str(x) for x in msgs])
# Attempt to colorize the output if supported # Attempt to colorize the output if supported