Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
path: root/archinstall/scripts/guided.py
diff options
context:
space:
mode:
Diffstat (limited to 'archinstall/scripts/guided.py')
-rw-r--r--archinstall/scripts/guided.py35
1 files changed, 11 insertions, 24 deletions
diff --git a/archinstall/scripts/guided.py b/archinstall/scripts/guided.py
index 9906e0a9..37cc1cad 100644
--- a/archinstall/scripts/guided.py
+++ b/archinstall/scripts/guided.py
@@ -1,9 +1,10 @@
-import logging
import os
from pathlib import Path
from typing import Any, TYPE_CHECKING
import archinstall
+from archinstall import info, debug
+from archinstall import SysInfo
from archinstall.lib import disk
from archinstall.lib.global_menu import GlobalMenu
from archinstall.default_profiles.applications.pipewire import PipewireProfile
@@ -13,7 +14,7 @@ from archinstall.lib.menu import Menu
from archinstall.lib.mirrors import use_mirrors
from archinstall.lib.models.bootloader import Bootloader
from archinstall.lib.models.network_configuration import NetworkConfigurationHandler
-from archinstall.lib.output import log
+from archinstall.lib.networking import check_mirror_reachable
from archinstall.lib.profile.profiles_handler import profile_handler
if TYPE_CHECKING:
@@ -24,20 +25,6 @@ if archinstall.arguments.get('help'):
print("See `man archinstall` for help.")
exit(0)
-if os.getuid() != 0:
- print(_("Archinstall requires root privileges to run. See --help for more."))
- exit(1)
-
-# Log various information about hardware before starting the installation. This might assist in troubleshooting
-archinstall.log(f"Hardware model detected: {archinstall.sys_vendor()} {archinstall.product_name()}; UEFI mode: {archinstall.has_uefi()}", level=logging.DEBUG)
-archinstall.log(f"Processor model detected: {archinstall.cpu_model()}", level=logging.DEBUG)
-archinstall.log(f"Memory statistics: {archinstall.mem_available()} available out of {archinstall.mem_total()} total installed", level=logging.DEBUG)
-archinstall.log(f"Virtualization detected: {archinstall.virtualization()}; is VM: {archinstall.is_vm()}", level=logging.DEBUG)
-archinstall.log(f"Graphics devices detected: {archinstall.graphics_devices().keys()}", level=logging.DEBUG)
-
-# For support reasons, we'll log the disk layout pre installation to match against post-installation layout
-archinstall.log(f"Disk states before installing: {disk.disk_layouts()}", level=logging.DEBUG)
-
def ask_user_questions():
"""
@@ -121,7 +108,7 @@ def perform_installation(mountpoint: Path):
Only requirement is that the block devices are
formatted and setup prior to entering this function.
"""
- log('Starting installation', level=logging.INFO)
+ info('Starting installation')
disk_config: disk.DiskLayoutConfiguration = archinstall.arguments['disk_config']
# Retrieve list of additional repositories and set boolean values appropriately
@@ -167,7 +154,7 @@ def perform_installation(mountpoint: Path):
if archinstall.arguments.get('swap'):
installation.setup_swap('zram')
- if archinstall.arguments.get("bootloader") == Bootloader.Grub and archinstall.has_uefi():
+ if archinstall.arguments.get("bootloader") == Bootloader.Grub and SysInfo.has_uefi():
installation.add_additional_packages("grub")
installation.add_bootloader(archinstall.arguments["bootloader"])
@@ -190,13 +177,13 @@ def perform_installation(mountpoint: Path):
installation.create_users(users)
if audio := archinstall.arguments.get('audio', None):
- log(f'Installing audio server: {audio}', level=logging.INFO)
+ info(f'Installing audio server: {audio}')
if audio == 'pipewire':
PipewireProfile().install(installation)
elif audio == 'pulseaudio':
installation.add_additional_packages("pulseaudio")
else:
- installation.log("No audio server will be installed.", level=logging.INFO)
+ info("No audio server will be installed")
if profile_config := archinstall.arguments.get('profile_config', None):
profile_handler.install_profile_config(installation, profile_config)
@@ -231,7 +218,7 @@ def perform_installation(mountpoint: Path):
installation.genfstab()
- installation.log("For post-installation tips, see https://wiki.archlinux.org/index.php/Installation_guide#Post-installation", fg="yellow")
+ info("For post-installation tips, see https://wiki.archlinux.org/index.php/Installation_guide#Post-installation")
if not archinstall.arguments.get('silent'):
prompt = str(_('Would you like to chroot into the newly created installation and perform post-installation configuration?'))
@@ -242,12 +229,12 @@ def perform_installation(mountpoint: Path):
except:
pass
- archinstall.log(f"Disk states after installing: {disk.disk_layouts()}", level=logging.DEBUG)
+ debug(f"Disk states after installing: {disk.disk_layouts()}")
-if archinstall.arguments.get('skip-mirror-check', False) is False and archinstall.check_mirror_reachable() is False:
+if archinstall.arguments.get('skip-mirror-check', False) is False and check_mirror_reachable() is False:
log_file = os.path.join(archinstall.storage.get('LOG_PATH', None), archinstall.storage.get('LOG_FILE', None))
- archinstall.log(f"Arch Linux mirrors are not reachable. Please check your internet connection and the log file '{log_file}'.", level=logging.INFO, fg="red")
+ info(f"Arch Linux mirrors are not reachable. Please check your internet connection and the log file '{log_file}'.")
exit(1)
if not archinstall.arguments.get('silent'):