Merge branch 'archlinux:master' into master

Author: bittin

PKGBUILD

@@ -5,7 +5,7 @@
 # Contributor: demostanis worlds <demostanis@protonmail.com>
 
 pkgname=archinstall
-pkgver=3.0.14
+pkgver=3.0.15
 pkgrel=1
 pkgdesc="Just another guided/automated Arch Linux installer with a twist"
 arch=(any)

README.md

@@ -23,7 +23,7 @@ The installer also doubles as a python library to install Arch Linux and manage
     # archinstall
 ```
 
-Alternative ways to install are `git clone` the repository or `pip install --upgrade archinstall`.
+Alternative ways to install are `git clone` the repository (and is better since you get the latest code regardless of [build date](https://archlinux.org/packages/?sort=&q=archinstall)) or `pip install --upgrade archinstall`.
 
 ## Running the [guided](https://github.com/archlinux/archinstall/blob/master/archinstall/scripts/guided.py) installer
 
@@ -36,11 +36,11 @@ archinstall
 
 ```shell
     # cd archinstall-git
-    # python -m archinstall
+    # python -m archinstall $@
 ```
 
 #### Advanced
-Some additional options that most users do not need are hidden behind the `--advanced` flag.
+Some additional options that most users do not need are hidden behind the `--advanced` flag and all options/args can be consulted through `-h` or `--help`. 
 
 ## Running from a declarative configuration file or URL
 
@@ -162,7 +162,7 @@ To test this without a live ISO, the simplest approach is to use a local image a
 This can be done by installing `pacman -S arch-install-scripts util-linux` locally and doing the following:
 
     # truncate -s 20G testimage.img
-    # losetup --partscan --show --find ./testimage.img
+    # losetup --partscan --show ./testimage.img
     # pip install --upgrade archinstall
     # python -m archinstall --script guided
     # qemu-system-x86_64 -enable-kvm -machine q35,accel=kvm -device intel-iommu -cpu host -m 4096 -boot order=d -drive file=./testimage.img,format=raw -drive if=pflash,format=raw,readonly,file=/usr/share/ovmf/x64/OVMF.4m.fd -drive if=pflash,format=raw,readonly,file=/usr/share/ovmf/x64/OVMF.4m.fd 

archinstall/applications/power_management.py

@@ -0,0 +1,35 @@
+from typing import TYPE_CHECKING
+
+from archinstall.lib.models.application import PowerManagement, PowerManagementConfiguration
+from archinstall.lib.output import debug
+
+if TYPE_CHECKING:
+	from archinstall.lib.installer import Installer
+
+
+class PowerManagementApp:
+	@property
+	def ppd_packages(self) -> list[str]:
+		return [
+			'power-profiles-daemon',
+		]
+
+	@property
+	def tuned_packages(self) -> list[str]:
+		return [
+			'tuned',
+			'tuned-ppd',
+		]
+
+	def install(
+		self,
+		install_session: 'Installer',
+		power_management_config: PowerManagementConfiguration,
+	) -> None:
+		debug(f'Installing power management daemon: {power_management_config.power_management.value}')
+
+		match power_management_config.power_management:
+			case PowerManagement.POWER_PROFILES_DAEMON:
+				install_session.add_additional_packages(self.ppd_packages)
+			case PowerManagement.TUNED:
+				install_session.add_additional_packages(self.tuned_packages)

archinstall/default_profiles/desktop.py

@@ -32,7 +32,6 @@ def packages(self) -> list[str]:
 			'wget',
 			'iwd',
 			'wireless_tools',
-			'wpa_supplicant',
 			'smartmontools',
 			'xdg-utils',
 		]

archinstall/lib/applications/application_handler.py

@@ -2,6 +2,7 @@
 
 from archinstall.applications.audio import AudioApp
 from archinstall.applications.bluetooth import BluetoothApp
+from archinstall.applications.power_management import PowerManagementApp
 from archinstall.applications.print_service import PrintServiceApp
 from archinstall.lib.models import Audio
 from archinstall.lib.models.application import ApplicationConfiguration
@@ -26,6 +27,12 @@ def install_applications(self, install_session: 'Installer', app_config: Applica
 				users,
 			)
 
+		if app_config.power_management_config:
+			PowerManagementApp().install(
+				install_session,
+				app_config.power_management_config,
+			)
+
 		if app_config.print_service_config and app_config.print_service_config.enabled:
 			PrintServiceApp().install(install_session)
 

archinstall/lib/applications/application_menu.py

@@ -1,7 +1,16 @@
 from typing import override
 
+from archinstall.lib.hardware import SysInfo
 from archinstall.lib.menu.abstract_menu import AbstractSubMenu
-from archinstall.lib.models.application import ApplicationConfiguration, Audio, AudioConfiguration, BluetoothConfiguration, PrintServiceConfiguration
+from archinstall.lib.models.application import (
+	ApplicationConfiguration,
+	Audio,
+	AudioConfiguration,
+	BluetoothConfiguration,
+	PowerManagement,
+	PowerManagementConfiguration,
+	PrintServiceConfiguration,
+)
 from archinstall.lib.translationhandler import tr
 from archinstall.tui.curses_menu import SelectMenu
 from archinstall.tui.menu_item import MenuItem, MenuItemGroup
@@ -54,8 +63,21 @@ def _define_menu_options(self) -> list[MenuItem]:
 				preview_action=self._prev_print_service,
 				key='print_service_config',
 			),
+			MenuItem(
+				text=tr('Power management'),
+				action=select_power_management,
+				preview_action=self._prev_power_management,
+				enabled=SysInfo.has_battery(),
+				key='power_management_config',
+			),
 		]
 
+	def _prev_power_management(self, item: MenuItem) -> str | None:
+		if item.value is not None:
+			config: PowerManagementConfiguration = item.value
+			return f'{tr("Power management")}: {config.power_management.value}'
+		return None
+
 	def _prev_bluetooth(self, item: MenuItem) -> str | None:
 		if item.value is not None:
 			bluetooth_config: BluetoothConfiguration = item.value
@@ -81,6 +103,29 @@ def _prev_print_service(self, item: MenuItem) -> str | None:
 		return None
 
 
+def select_power_management(preset: PowerManagementConfiguration | None = None) -> PowerManagementConfiguration | None:
+	group = MenuItemGroup.from_enum(PowerManagement)
+
+	if preset:
+		group.set_focus_by_value(preset.power_management)
+
+	result = SelectMenu[PowerManagement](
+		group,
+		allow_skip=True,
+		alignment=Alignment.CENTER,
+		allow_reset=True,
+		frame=FrameProperties.min(tr('Power management')),
+	).run()
+
+	match result.type_:
+		case ResultType.Skip:
+			return preset
+		case ResultType.Selection:
+			return PowerManagementConfiguration(power_management=result.get_value())
+		case ResultType.Reset:
+			return None
+
+
 def select_bluetooth(preset: BluetoothConfiguration | None) -> BluetoothConfiguration | None:
 	group = MenuItemGroup.yes_no()
 	group.focus_item = MenuItem.no()

archinstall/lib/args.py

@@ -13,7 +13,7 @@
 from pydantic.dataclasses import dataclass as p_dataclass
 
 from archinstall.lib.crypt import decrypt
-from archinstall.lib.models.application import ApplicationConfiguration
+from archinstall.lib.models.application import ApplicationConfiguration, ZramConfiguration
 from archinstall.lib.models.authentication import AuthenticationConfiguration
 from archinstall.lib.models.bootloader import Bootloader, BootloaderConfiguration
 from archinstall.lib.models.device import DiskEncryption, DiskLayoutConfiguration
@@ -67,12 +67,12 @@ class ArchConfig:
 	bootloader_config: BootloaderConfiguration | None = None
 	app_config: ApplicationConfiguration | None = None
 	auth_config: AuthenticationConfiguration | None = None
+	swap: ZramConfiguration | None = None
 	hostname: str = 'archlinux'
 	kernels: list[str] = field(default_factory=lambda: ['linux'])
 	ntp: bool = True
 	packages: list[str] = field(default_factory=list)
 	parallel_downloads: int = 0
-	swap: bool = True
 	timezone: str = 'UTC'
 	services: list[str] = field(default_factory=list)
 	custom_commands: list[str] = field(default_factory=list)
@@ -185,7 +185,7 @@ def from_config(cls, args_config: dict[str, Any], args: Arguments) -> 'ArchConfi
 			uki = args_config.get('uki', False)
 			if uki and not bootloader.has_uki_support():
 				uki = False
-			arch_config.bootloader_config = BootloaderConfiguration(bootloader=bootloader, uki=uki, removable=False)
+			arch_config.bootloader_config = BootloaderConfiguration(bootloader=bootloader, uki=uki, removable=True)
 
 		# deprecated: backwards compatibility
 		audio_config_args = args_config.get('audio_config', None)
@@ -211,7 +211,9 @@ def from_config(cls, args_config: dict[str, Any], args: Arguments) -> 'ArchConfi
 		if parallel_downloads := args_config.get('parallel_downloads', 0):
 			arch_config.parallel_downloads = parallel_downloads
 
-		arch_config.swap = args_config.get('swap', True)
+		swap_arg = args_config.get('swap')
+		if swap_arg is not None:
+			arch_config.swap = ZramConfiguration.parse_arg(swap_arg)
 
 		if timezone := args_config.get('timezone', 'UTC'):
 			arch_config.timezone = timezone

archinstall/lib/bootloader/bootloader_menu.py

@@ -83,8 +83,8 @@ def _prev_uki(self, item: MenuItem) -> str | None:
 
 	def _prev_removable(self, item: MenuItem) -> str | None:
 		if item.value:
-			return tr('Will install to /EFI/BOOT/ (removable location)')
-		return tr('Will install to standard location with NVRAM entry')
+			return tr('Will install to /EFI/BOOT/ (removable location, safe default)')
+		return tr('Will install to custom location with NVRAM entry')
 
 	@override
 	def run(
@@ -114,6 +114,9 @@ def _select_bootloader(self, preset: Bootloader | None) -> Bootloader | None:
 				removable_item.value = False
 				self._bootloader_conf.removable = False
 			else:
+				if not removable_item.enabled:
+					removable_item.value = True
+					self._bootloader_conf.removable = True
 				removable_item.enabled = True
 
 		return bootloader
@@ -147,18 +150,26 @@ def _select_removable(self, preset: bool) -> bool:
 			+ '\n\n'
 			+ tr('This installs the bootloader to /EFI/BOOT/BOOTX64.EFI (or similar) which is useful for:')
 			+ '\n\n  • '
+			+ tr('Firmware that does not properly support NVRAM boot entries like most MSI motherboards,')
+			+ '\n    '
+			+ tr('most Apple Macs, many laptops...')
+			+ '\n  • '
 			+ tr('USB drives or other portable external media.')
 			+ '\n  • '
 			+ tr('Systems where you want the disk to be bootable on any computer.')
-			+ '\n  • '
-			+ tr('Firmware that does not properly support NVRAM boot entries.')
 			+ '\n\n'
 			+ tr(
 				textwrap.dedent(
 					"""\
-					This is NOT recommended if none of the above apply, as it makes installing multiple
-					EFI bootloaders on the same disk more challenging, and it overwrites whatever bootloader
-					was previously installed on the default removable media search location, if any.
+					If you do not know what this means, LEAVE THIS OPTION ENABLED, as it is the safe default.
+
+					It is suggested to disable this if none of the above apply, as it makes installing multiple
+					EFI bootloaders on the same disk easier, and it will not overwrite whatever bootloader
+					was previously installed at the default removable media search location, if any.
+
+					It may also make the installation more resilient in case of dual-booting with Windows,
+					as Windows is known to sometimes erase or replace the bootloader installed at the removable
+					location.
 					"""
 				)
 			)

archinstall/lib/disk/device_handler.py

@@ -422,11 +422,18 @@ def _lvm_info_with_retry(
 		cmd: str,
 		info_type: Literal['lv', 'vg', 'pvseg'],
 	) -> LvmVolumeInfo | LvmGroupInfo | LvmPVInfo | None:
-		while True:
+		# Retry for up to 5 mins
+		max_retries = 100
+		for attempt in range(max_retries):
 			try:
 				return self._lvm_info(cmd, info_type)
 			except ValueError:
-				time.sleep(3)
+				if attempt < max_retries - 1:
+					debug(f'LVM info query failed (attempt {attempt + 1}/{max_retries}), retrying in 3 seconds...')
+					time.sleep(3)
+
+		debug(f'LVM info query failed after {max_retries} attempts')
+		return None
 
 	def lvm_vol_info(self, lv_name: str) -> LvmVolumeInfo | None:
 		cmd = f'lvs --reportformat json --unit B -S lv_name={lv_name}'
@@ -457,8 +464,22 @@ def lvm_export_vg(self, vg: LvmVolumeGroup) -> None:
 		SysCommand(cmd)
 
 	def lvm_import_vg(self, vg: LvmVolumeGroup) -> None:
-		cmd = f'vgimport {vg.name}'
+		# Check if the VG is actually exported before trying to import it
+		check_cmd = f'vgs --noheadings -o vg_exported {vg.name}'
+
+		try:
+			result = SysCommand(check_cmd)
+			is_exported = result.decode().strip() == 'exported'
+		except SysCallError:
+			# VG might not exist yet, skip import
+			debug(f'Volume group {vg.name} not found, skipping import')
+			return
 
+		if not is_exported:
+			debug(f'Volume group {vg.name} is already active (not exported), skipping import')
+			return
+
+		cmd = f'vgimport {vg.name}'
 		debug(f'vgimport: {cmd}')
 		SysCommand(cmd)
 
@@ -470,22 +491,25 @@ def lvm_vol_reduce(self, vol_path: Path, amount: Size) -> None:
 		SysCommand(cmd)
 
 	def lvm_pv_create(self, pvs: Iterable[Path]) -> None:
-		cmd = 'pvcreate ' + ' '.join([str(pv) for pv in pvs])
+		pvs_str = ' '.join([str(pv) for pv in pvs])
+		# Signatures are already wiped by wipefs, -f is just for safety
+		cmd = f'pvcreate -f --yes {pvs_str}'
+		# note flags used in scripting
 		debug(f'Creating LVM PVS: {cmd}')
+		SysCommand(cmd)
 
-		worker = SysCommandWorker(cmd)
-		worker.poll()
-		worker.write(b'y\n', line_ending=False)
+		# Sync with udev to ensure the PVs are visible
+		self.udev_sync()
 
 	def lvm_vg_create(self, pvs: Iterable[Path], vg_name: str) -> None:
 		pvs_str = ' '.join([str(pv) for pv in pvs])
-		cmd = f'vgcreate --yes {vg_name} {pvs_str}'
+		cmd = f'vgcreate --yes --force {vg_name} {pvs_str}'
 
 		debug(f'Creating LVM group: {cmd}')
+		SysCommand(cmd)
 
-		worker = SysCommandWorker(cmd)
-		worker.poll()
-		worker.write(b'y\n', line_ending=False)
+		# Sync with udev to ensure the VG is visible
+		self.udev_sync()
 
 	def lvm_vol_create(self, vg_name: str, volume: LvmVolume, offset: Size | None = None) -> None:
 		if offset is not None:
@@ -729,6 +753,17 @@ def partition(
 
 		disk.commit()
 
+		# Wipe filesystem/LVM signatures from newly created partitions
+		# to prevent "signature detected" errors
+		for part_mod in filtered_part:
+			if part_mod.dev_path:
+				debug(f'Wiping signatures from: {part_mod.dev_path}')
+				SysCommand(f'wipefs --all {part_mod.dev_path}')
+
+		# Sync with udev after wiping signatures
+		if filtered_part:
+			self.udev_sync()
+
 	@staticmethod
 	def swapon(path: Path) -> None:
 		try: