Merge remote-tracking branch 'origin/master' into fix-4336

svartkanin · svartkanin · commit c3cd65f3d694 · 2026-04-09T21:38:17.000+10:00
diff --git a/archinstall/applications/audio.py b/archinstall/applications/audio.py
@@ -1,5 +1,3 @@
-from __future__ import annotations
-
 from typing import TYPE_CHECKING
 
 from archinstall.lib.hardware import SysInfo
diff --git a/archinstall/applications/bluetooth.py b/archinstall/applications/bluetooth.py
@@ -1,5 +1,3 @@
-from __future__ import annotations
-
 from typing import TYPE_CHECKING
 
 from archinstall.lib.output import debug
diff --git a/archinstall/applications/firewall.py b/archinstall/applications/firewall.py
@@ -1,5 +1,3 @@
-from __future__ import annotations
-
 from typing import TYPE_CHECKING
 
 from archinstall.lib.models.application import Firewall, FirewallConfiguration
diff --git a/archinstall/applications/power_management.py b/archinstall/applications/power_management.py
@@ -1,5 +1,3 @@
-from __future__ import annotations
-
 from typing import TYPE_CHECKING
 
 from archinstall.lib.models.application import PowerManagement, PowerManagementConfiguration
diff --git a/archinstall/applications/print_service.py b/archinstall/applications/print_service.py
@@ -1,5 +1,3 @@
-from __future__ import annotations
-
 from typing import TYPE_CHECKING
 
 from archinstall.lib.output import debug
diff --git a/archinstall/default_profiles/desktop.py b/archinstall/default_profiles/desktop.py
@@ -1,5 +1,3 @@
-from __future__ import annotations
-
 from typing import TYPE_CHECKING, Self, override
 
 from archinstall.default_profiles.profile import DisplayServerType, GreeterType, Profile, ProfileType, SelectResult
diff --git a/archinstall/default_profiles/desktops/awesome.py b/archinstall/default_profiles/desktops/awesome.py
@@ -1,5 +1,3 @@
-from __future__ import annotations
-
 from typing import TYPE_CHECKING, override
 
 from archinstall.default_profiles.profile import DisplayServerType, Profile, ProfileType
diff --git a/archinstall/default_profiles/profile.py b/archinstall/default_profiles/profile.py
@@ -1,5 +1,3 @@
-from __future__ import annotations
-
 from enum import Enum, StrEnum, auto
 from typing import TYPE_CHECKING, Self
 
diff --git a/archinstall/default_profiles/server.py b/archinstall/default_profiles/server.py
@@ -1,5 +1,3 @@
-from __future__ import annotations
-
 from typing import TYPE_CHECKING, Self, override
 
 from archinstall.default_profiles.profile import Profile, ProfileType, SelectResult
diff --git a/archinstall/default_profiles/servers/docker.py b/archinstall/default_profiles/servers/docker.py
@@ -1,5 +1,3 @@
-from __future__ import annotations
-
 from typing import TYPE_CHECKING, override
 
 from archinstall.default_profiles.profile import Profile, ProfileType
diff --git a/archinstall/default_profiles/servers/mariadb.py b/archinstall/default_profiles/servers/mariadb.py
@@ -1,5 +1,3 @@
-from __future__ import annotations
-
 from typing import TYPE_CHECKING, override
 
 from archinstall.default_profiles.profile import Profile, ProfileType
diff --git a/archinstall/default_profiles/servers/postgresql.py b/archinstall/default_profiles/servers/postgresql.py
@@ -1,5 +1,3 @@
-from __future__ import annotations
-
 from typing import TYPE_CHECKING, override
 
 from archinstall.default_profiles.profile import Profile, ProfileType
diff --git a/archinstall/lib/applications/application_handler.py b/archinstall/lib/applications/application_handler.py
@@ -1,5 +1,3 @@
-from __future__ import annotations
-
 from typing import TYPE_CHECKING
 
 from archinstall.applications.audio import AudioApp
diff --git a/archinstall/lib/authentication/authentication_handler.py b/archinstall/lib/authentication/authentication_handler.py
@@ -1,5 +1,3 @@
-from __future__ import annotations
-
 import getpass
 from pathlib import Path
 from typing import TYPE_CHECKING
diff --git a/archinstall/lib/command.py b/archinstall/lib/command.py
@@ -379,6 +379,6 @@ def _append_log(file: str, content: str) -> None:
 
 		if change_perm:
 			path.chmod(stat.S_IRUSR | stat.S_IWUSR | stat.S_IRGRP)
-	except (PermissionError, FileNotFoundError):
+	except PermissionError, FileNotFoundError:
 		# If the file does not exist, ignore the error
 		pass
diff --git a/archinstall/lib/installer.py b/archinstall/lib/installer.py
@@ -1,9 +1,7 @@
-import glob
 import os
 import platform
 import re
 import shlex
-import shutil
 import subprocess
 import textwrap
 import time
@@ -507,11 +505,9 @@ def sync_log_to_install_medium(self) -> bool:
 		# at least the base has been strapped in, otherwise we won't have a filesystem/structure to copy to.
 		if self._helper_flags.get('base-strapped', False) is True:
 			absolute_logfile = logger.path
-
-			if not os.path.isdir(f'{self.target}/{os.path.dirname(absolute_logfile)}'):
-				os.makedirs(f'{self.target}/{os.path.dirname(absolute_logfile)}')
-
-			shutil.copy2(absolute_logfile, f'{self.target}/{absolute_logfile}')
+			logfile_target = self.target / absolute_logfile
+			logfile_target.parent.mkdir(parents=True, exist_ok=True)
+			absolute_logfile.copy(logfile_target, preserve_metadata=True)
 
 		return True
 
@@ -763,46 +759,46 @@ def configure_nic(self, nic: Nic) -> None:
 
 	def copy_iso_network_config(self, enable_services: bool = False) -> bool:
 		# Copy (if any) iwd password and config files
-		if os.path.isdir('/var/lib/iwd/'):
-			if psk_files := glob.glob('/var/lib/iwd/*.psk'):
-				if not os.path.isdir(f'{self.target}/var/lib/iwd'):
-					os.makedirs(f'{self.target}/var/lib/iwd')
-
-				if enable_services:
-					# If we haven't installed the base yet (function called pre-maturely)
-					if self._helper_flags.get('base', False) is False:
-						self._base_packages.append('iwd')
-
-						# This function will be called after minimal_installation()
-						# as a hook for post-installs. This hook is only needed if
-						# base is not installed yet.
-						def post_install_enable_iwd_service(*args: str, **kwargs: str) -> None:
-							self.enable_service('iwd')
-
-						self.post_base_install.append(post_install_enable_iwd_service)
-					# Otherwise, we can go ahead and add the required package
-					# and enable it's service:
-					else:
-						self.pacman.strap('iwd')
+		iwd_dir = LPath('/var/lib/iwd')
+		if psk_files := list(iwd_dir.glob('*.psk')):
+			iwd_target = self.target / iwd_dir.relative_to_root()
+			iwd_target.mkdir(parents=True, exist_ok=True)
+
+			for psk in psk_files:
+				psk.copy(iwd_target / psk.name, preserve_metadata=True)
+
+			if enable_services:
+				# If we haven't installed the base yet (function called pre-maturely)
+				if self._helper_flags.get('base', False) is False:
+					self._base_packages.append('iwd')
+
+					# This function will be called after minimal_installation()
+					# as a hook for post-installs. This hook is only needed if
+					# base is not installed yet.
+					def post_install_enable_iwd_service(*args: str, **kwargs: str) -> None:
 						self.enable_service('iwd')
 
-				for psk in psk_files:
-					shutil.copy2(psk, f'{self.target}/var/lib/iwd/{os.path.basename(psk)}')
+					self.post_base_install.append(post_install_enable_iwd_service)
+				# Otherwise, we can go ahead and add the required package
+				# and enable it's service:
+				else:
+					self.pacman.strap('iwd')
+					self.enable_service('iwd')
 
 		# Enable systemd-resolved by (forcefully) setting a symlink
 		# For further details see  https://wiki.archlinux.org/title/Systemd-resolved#DNS
-		resolv_config_path = Path(f'{self.target}/etc/resolv.conf')
-		if resolv_config_path.exists():
-			os.unlink(resolv_config_path)
-		os.symlink('/run/systemd/resolve/stub-resolv.conf', resolv_config_path)
+		resolv_config_path = self.target / 'etc/resolv.conf'
+		resolv_config_path.unlink(missing_ok=True)
+		resolv_config_path.symlink_to('/run/systemd/resolve/stub-resolv.conf')
 
 		# Copy (if any) systemd-networkd config files
-		if netconfigurations := glob.glob('/etc/systemd/network/*'):
-			if not os.path.isdir(f'{self.target}/etc/systemd/network/'):
-				os.makedirs(f'{self.target}/etc/systemd/network/')
+		network_dir = LPath('/etc/systemd/network')
+		if netconfigurations := list(network_dir.glob('*')):
+			network_target = self.target / network_dir.relative_to_root()
+			network_target.mkdir(parents=True, exist_ok=True)
 
 			for netconf_file in netconfigurations:
-				shutil.copy2(netconf_file, f'{self.target}/etc/systemd/network/{os.path.basename(netconf_file)}')
+				netconf_file.copy(network_target / netconf_file.name, preserve_metadata=True)
 
 			if enable_services:
 				# If we haven't installed the base yet (function called pre-maturely)
@@ -1486,7 +1482,7 @@ def _add_limine_bootloader(
 				efi_dir_path.mkdir(parents=True, exist_ok=True)
 
 				for file in ('BOOTIA32.EFI', 'BOOTX64.EFI'):
-					shutil.copy(limine_path / file, efi_dir_path)
+					(limine_path / file).copy(efi_dir_path)
 			except Exception as err:
 				raise DiskError(f'Failed to install Limine in {self.target}{efi_partition.mountpoint}: {err}')
 
@@ -1535,7 +1531,7 @@ def _add_limine_bootloader(
 
 			try:
 				# The `limine-bios.sys` file contains stage 3 code.
-				shutil.copy(limine_path / 'limine-bios.sys', boot_limine_path)
+				(limine_path / 'limine-bios.sys').copy(boot_limine_path)
 
 				# `limine bios-install` deploys the stage 1 and 2 to the
 				self.arch_chroot(f'limine bios-install {parent_dev_path}', peek_output=True)
@@ -2009,7 +2005,7 @@ def set_keyboard_language(self, language: str) -> bool:
 			# In accordance with https://github.com/archlinux/archinstall/issues/107#issuecomment-841701968
 			# Setting an empty keymap first, allows the subsequent call to set layout for both console and x11.
 			with Boot(self.target) as session:
-				os.system('systemd-run --machine=archinstall --pty localectl set-keymap ""')  # type: ignore[deprecated, unused-ignore]
+				os.system('systemd-run --machine=archinstall --pty localectl set-keymap ""')  # type: ignore[deprecated]
 
 				try:
 					session.SysCommand(['localectl', 'set-keymap', language])
@@ -2075,7 +2071,7 @@ def _service_state(self, service_name: str) -> str:
 
 
 def accessibility_tools_in_use() -> bool:
-	return os.system('systemctl is-active --quiet espeakup.service') == 0  # type: ignore[deprecated, unused-ignore]
+	return os.system('systemctl is-active --quiet espeakup.service') == 0  # type: ignore[deprecated]
 
 
 def run_custom_user_commands(commands: list[str], installation: Installer) -> None:
diff --git a/archinstall/lib/models/device.py b/archinstall/lib/models/device.py
@@ -1,5 +1,3 @@
-from __future__ import annotations
-
 import builtins
 import math
 import uuid
diff --git a/archinstall/lib/models/mirrors.py b/archinstall/lib/models/mirrors.py
@@ -1,5 +1,3 @@
-from __future__ import annotations
-
 import datetime
 import http.client
 import urllib.error
diff --git a/archinstall/lib/models/network.py b/archinstall/lib/models/network.py
@@ -218,7 +218,7 @@ def from_wpa_cli_output(cls, list_networks: str) -> list[Self]:
 						flags=flags,
 					)
 				)
-			except (ValueError, IndexError):
+			except ValueError, IndexError:
 				debug('Parsing error for network output')
 
 		return networks
diff --git a/archinstall/lib/models/profile.py b/archinstall/lib/models/profile.py
@@ -1,5 +1,3 @@
-from __future__ import annotations
-
 from dataclasses import dataclass
 from typing import TYPE_CHECKING, Self, TypedDict
 
diff --git a/archinstall/lib/pacman/config.py b/archinstall/lib/pacman/config.py
@@ -1,6 +1,5 @@
 import re
 from pathlib import Path
-from shutil import copy2
 
 from archinstall.lib.models.packages import Repository
 from archinstall.lib.pathnames import PACMAN_CONF
@@ -52,4 +51,4 @@ def apply(self) -> None:
 
 	def persist(self) -> None:
 		if self._repositories and self._config_remote_path:
-			copy2(PACMAN_CONF, self._config_remote_path)
+			PACMAN_CONF.copy(self._config_remote_path, preserve_metadata=True)
diff --git a/archinstall/lib/profile/profiles_handler.py b/archinstall/lib/profile/profiles_handler.py
@@ -1,5 +1,3 @@
-from __future__ import annotations
-
 import importlib.util
 import inspect
 import sys
diff --git a/archinstall/locales/cs/LC_MESSAGES/base.mo b/archinstall/locales/cs/LC_MESSAGES/base.mo
diff --git a/archinstall/locales/cs/LC_MESSAGES/base.po b/archinstall/locales/cs/LC_MESSAGES/base.po
diff --git a/archinstall/locales/de/LC_MESSAGES/base.po b/archinstall/locales/de/LC_MESSAGES/base.po
diff --git a/archinstall/scripts/guided.py b/archinstall/scripts/guided.py
diff --git a/archinstall/tui/curses_menu.py b/archinstall/tui/curses_menu.py
diff --git a/archinstall/tui/menu_item.py b/archinstall/tui/menu_item.py
diff --git a/archinstall/tui/ui/components.py b/archinstall/tui/ui/components.py
diff --git a/archinstall/tui/ui/menu_item.py b/archinstall/tui/ui/menu_item.py
diff --git a/pyproject.toml b/pyproject.toml

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,3 @@`
`1`		`-from __future__ import annotations`
`2`		`-`
`3`	`1`	`from typing import TYPE_CHECKING`
`4`	`2`
`5`	`3`	`from archinstall.lib.hardware import SysInfo`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,3 @@`
`1`		`-from __future__ import annotations`
`2`		`-`
`3`	`1`	`from typing import TYPE_CHECKING, Self, override`
`4`	`2`
`5`	`3`	`from archinstall.default_profiles.profile import DisplayServerType, GreeterType, Profile, ProfileType, SelectResult`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,3 @@`
`1`		`-from __future__ import annotations`
`2`		`-`
`3`	`1`	`from typing import TYPE_CHECKING, override`
`4`	`2`
`5`	`3`	`from archinstall.default_profiles.profile import DisplayServerType, Profile, ProfileType`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,3 @@`
`1`		`-from __future__ import annotations`
`2`		`-`
`3`	`1`	`from enum import Enum, StrEnum, auto`
`4`	`2`	`from typing import TYPE_CHECKING, Self`
`5`	`3`