Merge branch 'master' into fix-issue-4368-mkinitcpio

# Conflicts:
#	archinstall/lib/installer.py

Author: Softer

.github/workflows/translation-check.yaml

@@ -219,6 +219,10 @@ qemu-system-x86_64 -enable-kvm \
 
 # FAQ
 
+## AUR
+
+`archinstall` will not offer or bundle AUR helpers or AUR packages due to a current consensus. This is not any individual developers decision. The reasons and discussions for this stance on the topic can be found on our mailing list thread: [(optional) AUR helper in archinstall](https://lists.archlinux.org/archives/list/arch-dev-public@lists.archlinux.org/thread/VYOULH2GOJLFM2BXOFLWH3D754YXFPSL/).
+
 ## Keyring out-of-date
 For a description of the problem see https://archinstall.archlinux.page/help/known_issues.html#keyring-is-out-of-date-2213 and discussion in issue https://github.com/archlinux/archinstall/issues/2213.
 

README.md

@@ -21,6 +21,7 @@
 from archinstall.lib.models.locale import LocaleConfiguration
 from archinstall.lib.models.mirrors import MirrorConfiguration
 from archinstall.lib.models.network import NetworkConfiguration
+from archinstall.lib.models.package_types import DEFAULT_KERNEL
 from archinstall.lib.models.packages import Repository
 from archinstall.lib.models.pacman import PacmanConfiguration
 from archinstall.lib.models.profile import ProfileConfiguration
@@ -71,7 +72,7 @@ class ArchConfig:
 	auth_config: AuthenticationConfiguration | None = None
 	swap: ZramConfiguration | None = None
 	hostname: str = 'archlinux'
-	kernels: list[str] = field(default_factory=lambda: ['linux'])
+	kernels: list[str] = field(default_factory=lambda: [DEFAULT_KERNEL.value])
 	ntp: bool = True
 	packages: list[str] = field(default_factory=list)
 	pacman_config: PacmanConfiguration = field(default_factory=PacmanConfiguration.default)

archinstall/lib/args.py

@@ -10,6 +10,8 @@
 from archinstall.lib.crypt import encrypt
 from archinstall.lib.menu.helpers import Confirmation, Selection
 from archinstall.lib.menu.util import get_password, prompt_dir
+from archinstall.lib.models.bootloader import Bootloader
+from archinstall.lib.models.network import NetworkConfiguration
 from archinstall.lib.output import debug, logger, warn
 from archinstall.lib.translationhandler import tr
 from archinstall.tui.ui.menu_item import MenuItem, MenuItemGroup
@@ -58,6 +60,70 @@ def write_debug(self) -> None:
 		debug(' -- Chosen configuration --')
 		debug(self.user_config_to_json())
 
+	def as_summary(self) -> str:
+		"""
+		Render a concise two-column summary of the current configuration.
+
+		The left column holds section labels, the right column holds values.
+		Column width adapts to the longest translated label so translations
+		do not break the alignment. Rows whose underlying config is not set
+		are skipped.
+
+		Returns an empty string if nothing meaningful to show.
+		"""
+		rows: list[tuple[str, str]] = []
+
+		disk_config = self._config.disk_config
+		if disk_config and disk_config.device_modifications:
+			disk_parts: list[str] = []
+			for mod in disk_config.device_modifications:
+				path = str(mod.device_path)
+				root_part = mod.get_root_partition()
+				flags: list[str] = []
+				if root_part and root_part.fs_type:
+					flags.append(root_part.fs_type.value)
+				if disk_config.disk_encryption:
+					flags.append(tr('LUKS'))
+				disk_parts.append(f'{path} ({" + ".join(flags)})' if flags else path)
+			rows.append((tr('Disks'), ', '.join(disk_parts)))
+
+		bl_config = self._config.bootloader_config
+		if bl_config and bl_config.bootloader != Bootloader.NO_BOOTLOADER:
+			rows.append((tr('Bootloader'), bl_config.bootloader.value))
+
+		kernels = self._config.kernels
+		if kernels:
+			rows.append((tr('Kernel'), ', '.join(kernels)))
+
+		profile_config = self._config.profile_config
+		if profile_config and profile_config.profile:
+			names = profile_config.profile.current_selection_names()
+			rows.append((tr('Profile'), ', '.join(names) if names else profile_config.profile.name))
+			if profile_config.greeter:
+				rows.append((tr('Greeter'), profile_config.greeter.value))
+
+		packages = self._config.packages
+		if packages:
+			rows.append((tr('Packages'), str(len(packages))))
+
+		net_config = self._config.network_config
+		if isinstance(net_config, NetworkConfiguration):
+			rows.append((tr('Network'), net_config.type.display_msg()))
+
+		locale_config = self._config.locale_config
+		if locale_config:
+			rows.append((tr('Locale'), locale_config.sys_lang))
+
+		tz = self._config.timezone
+		if tz:
+			rows.append((tr('Timezone'), tz))
+
+		if not rows:
+			return ''
+
+		label_width = max(len(label) for label, _ in rows) + 2
+		return '\n'.join(f'{label:<{label_width}}{value}' for label, value in rows)
+
 	async def confirm_config(self) -> bool:
 		header = f'{tr("The specified configuration will be applied")}. '
 		header += tr('Would you like to continue?') + '\n'

archinstall/lib/configuration.py

@@ -3,29 +3,24 @@
 from archinstall.lib.hardware import GfxDriver, SysInfo
 from archinstall.lib.menu.helpers import Confirmation, Selection
 from archinstall.lib.models.application import ZramAlgorithm, ZramConfiguration
+from archinstall.lib.models.package_types import DEFAULT_KERNEL, Kernel
 from archinstall.lib.translationhandler import tr
 from archinstall.tui.ui.menu_item import MenuItem, MenuItemGroup
 from archinstall.tui.ui.result import ResultType
 
 
-async def select_kernel(preset: list[str] = []) -> list[str]:
+async def select_kernel(preset: list[Kernel] = []) -> list[Kernel]:
 	"""
 	Asks the user to select a kernel for system.
 
 	:return: The string as a selected kernel
 	:rtype: string
 	"""
-	kernels = ['linux', 'linux-lts', 'linux-zen', 'linux-hardened']
-	default_kernel = 'linux'
+	group = MenuItemGroup.from_enum(Kernel, sort_items=True, preset=preset)
+	group.set_default_by_value(DEFAULT_KERNEL)
+	group.set_focus_by_value(DEFAULT_KERNEL)
 
-	items = [MenuItem(k, value=k) for k in kernels]
-
-	group = MenuItemGroup(items, sort_items=True)
-	group.set_default_by_value(default_kernel)
-	group.set_focus_by_value(default_kernel)
-	group.set_selected_by_value(preset)
-
-	result = await Selection[str](
+	result = await Selection[Kernel](
 		group,
 		header=tr('Select which kernel(s) to install'),
 		allow_skip=True,

archinstall/lib/general/system_menu.py

@@ -6,7 +6,7 @@
 from archinstall.lib.authentication.authentication_menu import AuthenticationMenu
 from archinstall.lib.bootloader.bootloader_menu import BootloaderMenu
 from archinstall.lib.bootloader.utils import validate_bootloader_layout
-from archinstall.lib.configuration import save_config
+from archinstall.lib.configuration import ConfigurationOutput, save_config
 from archinstall.lib.disk.disk_menu import DiskLayoutConfigurationMenu
 from archinstall.lib.general.general_menu import select_hostname, select_ntp, select_timezone
 from archinstall.lib.general.system_menu import select_kernel, select_swap
@@ -22,6 +22,7 @@
 from archinstall.lib.models.locale import LocaleConfiguration
 from archinstall.lib.models.mirrors import MirrorConfiguration
 from archinstall.lib.models.network import NetworkConfiguration, NicType
+from archinstall.lib.models.package_types import DEFAULT_KERNEL
 from archinstall.lib.models.packages import Repository
 from archinstall.lib.models.pacman import PacmanConfiguration
 from archinstall.lib.models.profile import ProfileConfiguration
@@ -103,7 +104,7 @@ def _get_menu_options(self) -> list[MenuItem]:
 			),
 			MenuItem(
 				text=tr('Kernels'),
-				value=['linux'],
+				value=[DEFAULT_KERNEL],
 				action=select_kernel,
 				preview_action=self._prev_kernel,
 				mandatory=True,
@@ -503,7 +504,11 @@ def _prev_install_invalid_config(self, item: MenuItem) -> str | None:
 		if error := self._validate_bootloader():
 			return tr(f'Invalid configuration: {error}')
 
-		return None
+		self.sync_all_to_config()
+		summary = ConfigurationOutput(self._arch_config).as_summary()
+		if summary:
+			return f'{tr("Ready to install")}\n\n{summary}'
+		return tr('Ready to install')
 
 	def _prev_profile(self, item: MenuItem) -> str | None:
 		profile_config: ProfileConfiguration | None = item.value

archinstall/lib/global_menu.py

@@ -48,6 +48,7 @@
 from archinstall.lib.models.locale import LocaleConfiguration
 from archinstall.lib.models.mirrors import MirrorConfiguration
 from archinstall.lib.models.network import Nic
+from archinstall.lib.models.package_types import DEFAULT_KERNEL, Kernel
 from archinstall.lib.models.packages import Repository
 from archinstall.lib.models.pacman import PacmanConfiguration
 from archinstall.lib.models.users import User
@@ -65,7 +66,7 @@
 # pacman picks the first initramfs provider from the host's pacman.conf, which on non-Arch
 # hosts (EndeavourOS prefers dracut, etc.) breaks the installer's mkinitcpio() and
 # _config_uki() methods that assume mkinitcpio is present in the chroot.
-__packages__ = ['base', 'sudo', 'linux-firmware', 'mkinitcpio', 'linux', 'linux-lts', 'linux-zen', 'linux-hardened']
+__packages__ = ['base', 'sudo', 'linux-firmware', 'mkinitcpio'] + [k.value for k in Kernel]
 
 # Additional packages that are installed if the user is running the Live ISO with accessibility tools enabled
 __accessibility_packages__ = ['brltty', 'espeakup', 'alsa-utils']
@@ -85,7 +86,7 @@ def __init__(
 		It also wraps :py:func:`~archinstall.Installer.pacstrap` among other things.
 		"""
 		self._base_packages = base_packages or __packages__[:4]
-		self.kernels = kernels or ['linux']
+		self.kernels = kernels or [DEFAULT_KERNEL.value]
 		self._disk_config = disk_config
 
 		self._disk_encryption = disk_config.disk_encryption or DiskEncryption(EncryptionType.NO_ENCRYPTION)
@@ -744,6 +745,9 @@ def arch_chroot(self, cmd: str, run_as: str | None = None, peek_output: bool = F
 
 		return self.run_command(cmd, peek_output=peek_output)
 
+	def _chroot_argv(self, *args: str) -> list[str]:
+		return ['arch-chroot', '-S', str(self.target), *args]
+
 	def drop_to_shell(self) -> None:
 		subprocess.check_call(f'arch-chroot {self.target}', shell=True)
 
@@ -992,17 +996,7 @@ def setup_btrfs_snapshot(
 			}
 
 			for config_name, mountpoint in snapper.items():
-				command = [
-					'arch-chroot',
-					'-S',
-					str(self.target),
-					'snapper',
-					'--no-dbus',
-					'-c',
-					config_name,
-					'create-config',
-					mountpoint,
-				]
+				command = self._chroot_argv('snapper', '--no-dbus', '-c', config_name, 'create-config', mountpoint)
 
 				try:
 					SysCommand(command, peek_output=True)
@@ -1341,13 +1335,7 @@ def _add_grub_bootloader(
 
 		boot_dir = Path('/boot')
 
-		command = [
-			'arch-chroot',
-			'-S',
-			str(self.target),
-			'grub-install',
-			'--debug',
-		]
+		command = self._chroot_argv('grub-install', '--debug')
 
 		if SysInfo.has_uefi():
 			if not efi_partition:
@@ -1927,16 +1915,17 @@ def _create_user(self, user: User) -> None:
 		if not handled_by_plugin:
 			info(f'Creating user {user.username}')
 
-			cmd = 'useradd -m'
+			cmd = self._chroot_argv('useradd', '-m')
 
 			if user.sudo:
-				cmd += ' -G wheel'
+				cmd += ['-G', 'wheel']
 
-			cmd += f' {user.username}'
+			cmd += ['--', user.username]
 
 			try:
-				self.arch_chroot(cmd)
-			except SysCallError as err:
+				run(cmd)
+			except CalledProcessError as err:
+				debug(f'Error creating user {user.username}: {err}')
 				raise SystemError(f'Could not create user inside installation: {err}')
 
 		for plugin in plugins.values():
@@ -1947,7 +1936,11 @@ def _create_user(self, user: User) -> None:
 		self.set_user_password(user)
 
 		for group in user.groups:
-			self.arch_chroot(f'gpasswd -a {user.username} {group}')
+			cmd = self._chroot_argv('gpasswd', '-a', user.username, group)
+			try:
+				run(cmd)
+			except CalledProcessError as err:
+				warn(f'Failed to add {user.username} to group {group}: {err}')
 
 		if user.sudo:
 			self.enable_sudo(user)
@@ -1962,7 +1955,7 @@ def set_user_password(self, user: User) -> bool:
 			return False
 
 		input_data = f'{user.username}:{enc_password}'.encode()
-		cmd = ['arch-chroot', '-S', str(self.target), 'chpasswd', '--encrypted']
+		cmd = self._chroot_argv('chpasswd', '--encrypted')
 
 		try:
 			run(cmd, input_data=input_data)
@@ -1974,7 +1967,7 @@ def set_user_password(self, user: User) -> bool:
 	def user_set_shell(self, user: str, shell: str) -> bool:
 		info(f'Setting shell for {user} to {shell}')
 
-		cmd = ['arch-chroot', '-S', str(self.target), 'chsh', '-s', shell, user]
+		cmd = self._chroot_argv('chsh', '-s', shell, user)
 		try:
 			run(cmd)
 			return True
@@ -1984,7 +1977,7 @@ def user_set_shell(self, user: str, shell: str) -> bool:
 
 	def chown(self, owner: str, path: str, options: list[str] | None = None) -> bool:
 		options = options or []
-		cmd = ['arch-chroot', '-S', str(self.target), 'chown', *options, owner, path]
+		cmd = self._chroot_argv('chown', *options, '--', owner, path)
 		try:
 			run(cmd)
 			return True
@@ -1995,12 +1988,10 @@ def chown(self, owner: str, path: str, options: list[str] | None = None) -> bool
 	def set_vconsole(self, locale_config: LocaleConfiguration) -> None:
 		# use the already set kb layout
 		kb_vconsole: str = locale_config.kb_layout
-		# this is the default used in ISO other option for hdpi screens TER16x32
-		# can be checked using
-		# zgrep "CONFIG_FONT" /proc/config.gz
-		# https://wiki.archlinux.org/title/Linux_console#Fonts
+		font_vconsole = locale_config.console_font
 
-		font_vconsole = 'default8x16'
+		if font_vconsole.startswith('ter-'):
+			self.pacman.strap(['terminus-font'])
 
 		# Ensure /etc exists
 		vconsole_dir: Path = self.target / 'etc'