From ffe38c879acf59da3f9d25ba866608ff6d6db64d Mon Sep 17 00:00:00 2001
From: SecondThundeR <awayfromgalaxy@gmail.com>
Date: Sun, 19 Sep 2021 15:49:44 +0300
Subject: general: remove all found white-spaces

Also this change adds new line at the end for some scripts
---
 archinstall/lib/disk.py             |  2 +-
 archinstall/lib/plugins.py          |  2 +-
 archinstall/lib/user_interaction.py | 14 +++++++-------
 3 files changed, 9 insertions(+), 9 deletions(-)

(limited to 'archinstall/lib')

diff --git a/archinstall/lib/disk.py b/archinstall/lib/disk.py
index 872d9bfc..5b92e1e1 100644
--- a/archinstall/lib/disk.py
+++ b/archinstall/lib/disk.py
@@ -1069,4 +1069,4 @@ def find_partition_by_mountpoint(block_devices, relative_mountpoint :str):
 	for device in block_devices:
 		for partition in block_devices[device]['partitions']:
 			if partition.get('mountpoint', None) == relative_mountpoint:
-				return partition
\ No newline at end of file
+				return partition
diff --git a/archinstall/lib/plugins.py b/archinstall/lib/plugins.py
index 24fbd8ee..dab5d2b0 100644
--- a/archinstall/lib/plugins.py
+++ b/archinstall/lib/plugins.py
@@ -98,4 +98,4 @@ def load_plugin(path :str): # -> module (not sure how to write that in type defi
 				log(err, level=logging.ERROR)
 				log(f"The above error was detected when initiating the plugin: {path}", fg="red", level=logging.ERROR)
 		else:
-			log(f"Plugin '{path}' is missing a valid entry-point or is corrupt.", fg="yellow", level=logging.WARNING)
\ No newline at end of file
+			log(f"Plugin '{path}' is missing a valid entry-point or is corrupt.", fg="yellow", level=logging.WARNING)
diff --git a/archinstall/lib/user_interaction.py b/archinstall/lib/user_interaction.py
index 6854ccfd..4ec265d4 100644
--- a/archinstall/lib/user_interaction.py
+++ b/archinstall/lib/user_interaction.py
@@ -575,14 +575,14 @@ def manage_new_and_existing_partitions(block_device :BlockDevice) -> dict:
 	# log(f"Selecting which partitions to re-use on {block_device}...", fg="yellow", level=logging.INFO)
 	# partitions = generic_multi_select(block_device.partitions.values(), "Select which partitions to re-use (the rest will be left alone): ", sort=True)
 	# partitions_to_wipe = generic_multi_select(partitions, "Which partitions do you wish to wipe (multiple can be selected): ", sort=True)
-	
+
 	# mountpoints = {}
 	# struct = {
 	# 	"partitions" : []
 	# }
 	# for partition in partitions:
 	# 	mountpoint = input(f"Select a mountpoint (or skip) for {partition}: ").strip()
-		
+
 	# 	part_struct = {}
 	# 	if mountpoint:
 	# 		part_struct['mountpoint'] = mountpoint
@@ -590,7 +590,7 @@ def manage_new_and_existing_partitions(block_device :BlockDevice) -> dict:
 	# 			part_struct['boot'] = True
 	# 			if has_uefi():
 	# 				part_struct['ESP'] = True
-	# 		elif mountpoint == '/' and 
+	# 		elif mountpoint == '/' and
 	# 	if partition.uuid:
 	# 		part_struct['PARTUUID'] = partition.uuid
 	# 	if partition in partitions_to_wipe:
@@ -632,15 +632,15 @@ def manage_new_and_existing_partitions(block_device :BlockDevice) -> dict:
 
 		if not task:
 			break
-		
+
 		if task == 'Create a new partition':
 			if partition_type == 'gpt':
 				# https://www.gnu.org/software/parted/manual/html_node/mkpart.html
 				# https://www.gnu.org/software/parted/manual/html_node/mklabel.html
 				name = input("Enter a desired name for the partition: ").strip()
-			
+
 			fstype = input("Enter a desired filesystem type for the partition: ").strip()
-			
+
 			start = input(f"Enter the start sector (percentage or block number, default: {block_device.largest_free_space[0]}): ").strip()
 			if not start.strip():
 				start = block_device.largest_free_space[0]
@@ -750,7 +750,7 @@ def select_individual_blockdevice_usage(block_devices :list):
 
 	for device in block_devices:
 		layout = manage_new_and_existing_partitions(device)
-		
+
 		result[device.path] = layout
 
 	return result
-- 
cgit v1.2.3-70-g09d2


From d2d80113b3c6a337097b407674f67b84cc14c82a Mon Sep 17 00:00:00 2001
From: Hugo Ankarloo <hugo@ilait.se>
Date: Mon, 20 Sep 2021 19:30:07 +0200
Subject: Fix Bug: Timezone is ignored, always same as host

Bug affects normal interactive usage (example/guided.py).

The timezone configured in the installer is not the timezone that
ends up in the new installed system. Instead, the timezone
used in the host system (from where the installer is run) is the
one that finally ends up being used.

Reason: systemd-nspawn by default copies the host timezone into
the target. And systemd-nspawn is run when keyboard-layout is
changed (which is done after changing the timezone).

Solution: Add option `--timezone=off` to systemd-nspawn, which
hinders affecting the timezone in the target.
---
 archinstall/lib/systemd.py | 1 +
 1 file changed, 1 insertion(+)

(limited to 'archinstall/lib')

diff --git a/archinstall/lib/systemd.py b/archinstall/lib/systemd.py
index 383f1f17..d297c507 100644
--- a/archinstall/lib/systemd.py
+++ b/archinstall/lib/systemd.py
@@ -64,6 +64,7 @@ class Boot:
 			self.session = SysCommandWorker([
 				'/usr/bin/systemd-nspawn',
 				'-D', self.instance.target,
+				'--timezone=off',
 				'-b',
 				'--machine', self.container_name
 			])
-- 
cgit v1.2.3-70-g09d2


From ffbfafb35428168366de3ced572f648c6d49dc03 Mon Sep 17 00:00:00 2001
From: Hugo Ankarloo <hugo@ilait.se>
Date: Mon, 20 Sep 2021 19:58:56 +0200
Subject: Fix Bug: config b0rked by Suggest partition layout

File: lib/user_interaction.py

When function manage_new_and_existing_partitions() is used, and
'Suggest partition layout' is selected, the partition info is not
correctly stored in the config.

Instead of: {"partitions": [{...}, {...}]}
You get: {"partitions": {"partitions": [{...}, {...}], "wipe":True}}
---
 archinstall/lib/user_interaction.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'archinstall/lib')

diff --git a/archinstall/lib/user_interaction.py b/archinstall/lib/user_interaction.py
index b017e41a..66dd3350 100644
--- a/archinstall/lib/user_interaction.py
+++ b/archinstall/lib/user_interaction.py
@@ -674,7 +674,7 @@ def manage_new_and_existing_partitions(block_device :BlockDevice) -> dict:
 				if input(f"{block_device} contains queued partitions, this will remove those, are you sure? y/N: ").strip().lower() in ('', 'n'):
 					continue
 
-			block_device_struct["partitions"] = suggest_single_disk_layout(block_device)[block_device]
+			block_device_struct.update( suggest_single_disk_layout(block_device)[block_device] )
 		elif task is None:
 			return block_device_struct
 		else:
-- 
cgit v1.2.3-70-g09d2


From 915ae88947a008a21006d2572e498ed0c134350c Mon Sep 17 00:00:00 2001
From: Hugo Ankarloo <hugo@ilait.se>
Date: Mon, 20 Sep 2021 20:17:39 +0200
Subject: Fix Bug: Set filesystem crashes if no partitions

File: lib/user_interaction.py

When function manage_new_and_existing_partitions() is used, and
no partitions are configured, and 'Set desired filesystem for a
partition' is selected, the installer crashes.
---
 archinstall/lib/user_interaction.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'archinstall/lib')

diff --git a/archinstall/lib/user_interaction.py b/archinstall/lib/user_interaction.py
index 66dd3350..ca8fb6f6 100644
--- a/archinstall/lib/user_interaction.py
+++ b/archinstall/lib/user_interaction.py
@@ -730,7 +730,10 @@ def manage_new_and_existing_partitions(block_device :BlockDevice) -> dict:
 					block_device_struct["partitions"][block_device_struct["partitions"].index(partition)]['boot'] = not block_device_struct["partitions"][block_device_struct["partitions"].index(partition)].get('boot', False)
 
 			elif task == "Set desired filesystem for a partition":
-				if (partition := generic_select(block_device_struct["partitions"], 'Select which partition to set a filesystem on: ', options_output=False)):
+				if not block_device_struct["partitions"]:
+					log("No partitions found. Create some partitions first", level=logging.WARNING, fg='yellow')
+					continue
+				elif (partition := generic_select(block_device_struct["partitions"], 'Select which partition to set a filesystem on: ', options_output=False)):
 					if not block_device_struct["partitions"][block_device_struct["partitions"].index(partition)].get('filesystem', None):
 						block_device_struct["partitions"][block_device_struct["partitions"].index(partition)]['filesystem'] = {}
 
-- 
cgit v1.2.3-70-g09d2


From 26244212cfe2d2ecbf7c791c811deb499e7a3bcf Mon Sep 17 00:00:00 2001
From: Hugo Ankarloo <hugo@ilait.se>
Date: Mon, 20 Sep 2021 21:46:56 +0200
Subject: Fix Bug: Cannot get partuuid from loop device

File: lib/disk.py

When installing on a loopback device (a.k.a loop device), function
Filesystem.partuuid_to_index() crashes with a JSON parsing error.

REASON

1) For loop devices, the property BlockDevice.device returns the
   actual image file (back-file) of the loop device instead of the
   /dev/X device.

2) Function Filesystem.partuuid_to_index() executes `lsblk --json`
   against BlockDevice.device .

3) `lsblk` fails and prints the error "not a block device" to stderr.
   This causes the output to not be valid JSON.

4) Code crashes when JSON parser tries to parse the output.

SOLUTION

- Make sure property BlockDevice.device only returns a valid block
  device.

- Create new function BlockDevice.device_or_backfile that mimics
  the present behaviour of BlockDevice.device.

- Use BlockDevice.device_or_backfile in function
  BlockDevice.__repr__().

SOLUTION REASONING

I can only see one reason behind BlockDevice.device returning
the back-file of a loop device, and that is to show the back-file
to the user (instead of /dev/X) when printing the string
representation of a BlockDevice.

All other parts of the code can use the /dev/X file just fine.

And IMO it makes more sense that a property named `device` only
returns devices, and not normal files.
---
 archinstall/lib/disk.py | 26 ++++++++++++++++++--------
 1 file changed, 18 insertions(+), 8 deletions(-)

(limited to 'archinstall/lib')

diff --git a/archinstall/lib/disk.py b/archinstall/lib/disk.py
index c86bf7bc..33f598bf 100644
--- a/archinstall/lib/disk.py
+++ b/archinstall/lib/disk.py
@@ -244,7 +244,7 @@ class BlockDevice:
 		#       I'm placing the encryption password on a BlockDevice level.
 
 	def __repr__(self, *args, **kwargs):
-		return f"BlockDevice({self.device}, size={self.size}GB, free_space={'+'.join(part[2] for part in self.free_space)}, bus_type={self.bus_type})"
+		return f"BlockDevice({self.device_or_backfile}, size={self.size}GB, free_space={'+'.join(part[2] for part in self.free_space)}, bus_type={self.bus_type})"
 
 	def __iter__(self):
 		for partition in self.partitions:
@@ -285,23 +285,33 @@ class BlockDevice:
 			return device['pttype']
 
 	@property
-	def device(self):
+	def device_or_backfile(self):
 		"""
 		Returns the actual device-endpoint of the BlockDevice.
 		If it's a loop-back-device it returns the back-file,
-		If it's a ATA-drive it returns the /dev/X device
-		And if it's a crypto-device it returns the parent device
+		For other types it return self.device
 		"""
-		if "type" not in self.info:
-			raise DiskError(f'Could not locate backplane info for "{self.path}"')
-
 		if self.info['type'] == 'loop':
 			for drive in json.loads(SysCommand(['losetup', '--json']).decode('UTF_8'))['loopdevices']:
 				if not drive['name'] == self.path:
 					continue
 
 				return drive['back-file']
-		elif self.info['type'] == 'disk':
+		else:
+			return self.device
+
+	@property
+	def device(self):
+		"""
+		Returns the device file of the BlockDevice.
+		If it's a loop-back-device it returns the /dev/X device,
+		If it's a ATA-drive it returns the /dev/X device
+		And if it's a crypto-device it returns the parent device
+		"""
+		if "type" not in self.info:
+			raise DiskError(f'Could not locate backplane info for "{self.path}"')
+
+		if self.info['type'] in ['disk','loop']:
 			return self.path
 		elif self.info['type'][:4] == 'raid':
 			# This should catch /dev/md## raid devices
-- 
cgit v1.2.3-70-g09d2


From 5bcbb50936690deff12a085634215c2d4f42f38c Mon Sep 17 00:00:00 2001
From: Hugo Ankarloo <hugo@ilait.se>
Date: Tue, 21 Sep 2021 00:38:20 +0200
Subject: Fix Bug: 'Suggest partition layout' crashes

File: lib/user_interaction.py

When function manage_new_and_existing_partitions() is used, and
'Suggest partition layout' is selected, the installer crashes.

REASON
Bug was introduced in commit 9e67ce3, when partition layout was
changed to use device.path as keys (instead of device).

It seems all necessary changes were made for this, except this one.
---
 archinstall/lib/user_interaction.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'archinstall/lib')

diff --git a/archinstall/lib/user_interaction.py b/archinstall/lib/user_interaction.py
index be74f9b9..ba6259b1 100644
--- a/archinstall/lib/user_interaction.py
+++ b/archinstall/lib/user_interaction.py
@@ -674,7 +674,7 @@ def manage_new_and_existing_partitions(block_device :BlockDevice) -> dict:
 				if input(f"{block_device} contains queued partitions, this will remove those, are you sure? y/N: ").strip().lower() in ('', 'n'):
 					continue
 
-			block_device_struct.update( suggest_single_disk_layout(block_device)[block_device] )
+			block_device_struct.update( suggest_single_disk_layout(block_device)[block_device.path] )
 		elif task is None:
 			return block_device_struct
 		else:
-- 
cgit v1.2.3-70-g09d2


From 427492d7c9a386dbeb08561f163b9a68870f6e71 Mon Sep 17 00:00:00 2001
From: Oleksandr Zinkevych <zso040399@gmail.com>
Date: Fri, 15 Oct 2021 18:03:08 +0300
Subject: Fix re_rank_mirrors

---
 archinstall/lib/mirrors.py | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

(limited to 'archinstall/lib')

diff --git a/archinstall/lib/mirrors.py b/archinstall/lib/mirrors.py
index 1b62a61b..2325282f 100644
--- a/archinstall/lib/mirrors.py
+++ b/archinstall/lib/mirrors.py
@@ -123,10 +123,17 @@ def use_mirrors(regions: dict, destination='/etc/pacman.d/mirrorlist'):
 	return True
 
 
-def re_rank_mirrors(top=10, *positionals, **kwargs):
-	if SysCommand(f'/usr/bin/rankmirrors -n {top} /etc/pacman.d/mirrorlist > /etc/pacman.d/mirrorlist').exit_code == 0:
-		return True
-	return False
+def re_rank_mirrors(
+	top: int = 10,
+	src: str = '/etc/pacman.d/mirrorlist',
+	dst: str = '/etc/pacman.d/mirrorlist',
+) -> bool:
+	cmd = SysCommand(f"/usr/bin/rankmirrors -n {top} {src}")
+	if cmd.exit_code != 0:
+		return False
+	with open(dst, 'w') as f:
+		f.write(str(cmd))
+	return True
 
 
 def list_mirrors(sort_order=["https", "http"]):
-- 
cgit v1.2.3-70-g09d2


From 165d47f4bb3d79f405691a7cfb6ece55b33cd81c Mon Sep 17 00:00:00 2001
From: Oleksandr Zinkevych <zso040399@gmail.com>
Date: Fri, 15 Oct 2021 18:21:35 +0300
Subject: Fix use_mirrors

---
 archinstall/lib/mirrors.py | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

(limited to 'archinstall/lib')

diff --git a/archinstall/lib/mirrors.py b/archinstall/lib/mirrors.py
index 1b62a61b..12fa7450 100644
--- a/archinstall/lib/mirrors.py
+++ b/archinstall/lib/mirrors.py
@@ -1,6 +1,6 @@
 import urllib.error
 import urllib.request
-from typing import Union
+from typing import Union, Mapping, Iterable
 
 from .general import *
 from .output import log
@@ -113,10 +113,13 @@ def insert_mirrors(mirrors, *args, **kwargs):
 	return True
 
 
-def use_mirrors(regions: dict, destination='/etc/pacman.d/mirrorlist'):
+def use_mirrors(
+	regions: Mapping[str, Iterable[str]],
+	destination: str ='/etc/pacman.d/mirrorlist'
+) -> bool:
 	log(f'A new package mirror-list has been created: {destination}', level=logging.INFO)
-	for region, mirrors in regions.items():
-		with open(destination, 'w') as mirrorlist:
+	with open(destination, 'w') as mirrorlist:
+		for region, mirrors in regions.items():
 			for mirror in mirrors:
 				mirrorlist.write(f'## {region}\n')
 				mirrorlist.write(f'Server = {mirror}\n')
-- 
cgit v1.2.3-70-g09d2


From ca25c356b687ffe9a2b63494de97607e8adc68ca Mon Sep 17 00:00:00 2001
From: Richard Neumann <mail@richard-neumann.de>
Date: Thu, 21 Oct 2021 22:48:52 +0200
Subject: Update type hints

meminfo() returns ints.
---
 archinstall/lib/hardware.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'archinstall/lib')

diff --git a/archinstall/lib/hardware.py b/archinstall/lib/hardware.py
index a8f87b80..e4308638 100644
--- a/archinstall/lib/hardware.py
+++ b/archinstall/lib/hardware.py
@@ -152,15 +152,15 @@ def product_name() -> Optional[str]:
 		return product.read().strip()
 
 
-def mem_available() -> Optional[str]:
+def mem_available() -> Optional[int]:
 	return meminfo('MemAvailable')
 
 
-def mem_free() -> Optional[str]:
+def mem_free() -> Optional[int]:
 	return meminfo('MemFree')
 
 
-def mem_total() -> Optional[str]:
+def mem_total() -> Optional[int]:
 	return meminfo('MemTotal')
 
 
-- 
cgit v1.2.3-70-g09d2


From 4f6cec5069023198b047cb61e3e65fb37a93d577 Mon Sep 17 00:00:00 2001
From: Richard Neumann <mail@richard-neumann.de>
Date: Thu, 21 Oct 2021 22:50:49 +0200
Subject: Remove useless initialization of mem_info = {}

---
 archinstall/lib/hardware.py | 2 --
 1 file changed, 2 deletions(-)

(limited to 'archinstall/lib')

diff --git a/archinstall/lib/hardware.py b/archinstall/lib/hardware.py
index e4308638..4f8192e4 100644
--- a/archinstall/lib/hardware.py
+++ b/archinstall/lib/hardware.py
@@ -79,8 +79,6 @@ def meminfo(key: Optional[str] = None) -> Union[dict[str, int], int]:
 	"""Returns a dict with memory info if called with no args
 	or the value of the given key of said dict.
 	"""
-	mem_info = {}
-
 	with MEMINFO.open() as file:
 		mem_info = {
 			(columns := line.strip().split())[0].rstrip(':'): int(columns[1])
-- 
cgit v1.2.3-70-g09d2


From 63c6f39f98efcaa644d2d64c2e9468cb240a32dd Mon Sep 17 00:00:00 2001
From: Richard Neumann <mail@richard-neumann.de>
Date: Thu, 21 Oct 2021 22:54:00 +0200
Subject: Generalize CPU vendor detection

Implement has_amd_cpu() and has_intel_cpu() as partials.
---
 archinstall/lib/hardware.py | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

(limited to 'archinstall/lib')

diff --git a/archinstall/lib/hardware.py b/archinstall/lib/hardware.py
index 4f8192e4..7172628b 100644
--- a/archinstall/lib/hardware.py
+++ b/archinstall/lib/hardware.py
@@ -1,4 +1,5 @@
 import os
+from functools import partial
 from pathlib import Path
 from typing import Iterator, Optional, Union
 
@@ -95,11 +96,11 @@ def has_wifi() -> bool:
 	return 'WIRELESS' in enrich_iface_types(list_interfaces().values()).values()
 
 
-def has_amd_cpu() -> bool:
-	return any(cpu.get("vendor_id") == "AuthenticAMD" for cpu in cpuinfo())
+def has_cpu_vendor(vendor_id: str) -> bool:
+	return any(cpu.get("vendor_id") == vendor_id for cpu in cpuinfo())
 
-def has_intel_cpu() -> bool:
-	return any(cpu.get("vendor_id") == "GenuineIntel" for cpu in cpuinfo())
+has_amd_cpu = partial(has_cpu_vendor, "AuthenticAMD")
+has_intel_cpu = partial(has_cpu_vendor, "GenuineIntel")
 
 def has_uefi() -> bool:
 	return os.path.isdir('/sys/firmware/efi')
-- 
cgit v1.2.3-70-g09d2


From 8eea3259245814e269e32ce69a08b81fcb2fca53 Mon Sep 17 00:00:00 2001
From: Richard Neumann <mail@richard-neumann.de>
Date: Thu, 21 Oct 2021 22:56:46 +0200
Subject: Improve type hint

---
 archinstall/lib/hardware.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'archinstall/lib')

diff --git a/archinstall/lib/hardware.py b/archinstall/lib/hardware.py
index 7172628b..bbfb06a9 100644
--- a/archinstall/lib/hardware.py
+++ b/archinstall/lib/hardware.py
@@ -76,7 +76,7 @@ def cpuinfo() -> Iterator[dict[str, str]]:
 			cpu[key.strip()] = value.strip()
 
 
-def meminfo(key: Optional[str] = None) -> Union[dict[str, int], int]:
+def meminfo(key: Optional[str] = None) -> Union[dict[str, int], Optional[int]]:
 	"""Returns a dict with memory info if called with no args
 	or the value of the given key of said dict.
 	"""
-- 
cgit v1.2.3-70-g09d2


From a822b8edae2c80edc86e786e27d876b705b5c985 Mon Sep 17 00:00:00 2001
From: Oleksandr Zinkevych <zso040399@gmail.com>
Date: Fri, 22 Oct 2021 14:53:18 +0300
Subject: use_mirrors: return None instead of True

---
 archinstall/lib/mirrors.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'archinstall/lib')

diff --git a/archinstall/lib/mirrors.py b/archinstall/lib/mirrors.py
index 12fa7450..739bf1a8 100644
--- a/archinstall/lib/mirrors.py
+++ b/archinstall/lib/mirrors.py
@@ -116,14 +116,13 @@ def insert_mirrors(mirrors, *args, **kwargs):
 def use_mirrors(
 	regions: Mapping[str, Iterable[str]],
 	destination: str ='/etc/pacman.d/mirrorlist'
-) -> bool:
+) -> None:
 	log(f'A new package mirror-list has been created: {destination}', level=logging.INFO)
 	with open(destination, 'w') as mirrorlist:
 		for region, mirrors in regions.items():
 			for mirror in mirrors:
 				mirrorlist.write(f'## {region}\n')
 				mirrorlist.write(f'Server = {mirror}\n')
-	return True
 
 
 def re_rank_mirrors(top=10, *positionals, **kwargs):
-- 
cgit v1.2.3-70-g09d2