From ebf59809432ac205d7b77b44dbcf611d98078a0c Mon Sep 17 00:00:00 2001
From: Dylan Taylor <dylan@dylanmtaylor.com>
Date: Fri, 21 May 2021 06:29:10 -0400
Subject: Add ability to provide an array of services to enable in config file

---
 examples/custom-command-sample.json | 1 +
 examples/guided.py                  | 5 +++++
 2 files changed, 6 insertions(+)

(limited to 'examples')

diff --git a/examples/custom-command-sample.json b/examples/custom-command-sample.json
index 0518d3db..5e7a70e3 100644
--- a/examples/custom-command-sample.json
+++ b/examples/custom-command-sample.json
@@ -26,6 +26,7 @@
     },
     "packages": ["docker", "git", "wget", "zsh"],
     "profile": "gnome",
+    "services": ["docker"],
     "superusers": {
         "devel": {
             "!password": "devel"
diff --git a/examples/guided.py b/examples/guided.py
index d23c483e..f61548e1 100644
--- a/examples/guided.py
+++ b/examples/guided.py
@@ -379,6 +379,11 @@ def perform_installation(mountpoint):
 						archinstall.log(' * Profile\'s post configuration requirements was not fulfilled.', fg='red')
 						exit(1)
 
+		# If the user provided a list of services to be enabled, pass the list to the enable_service function.
+		# Note that while it's called enable_service, it can actually take a list of services and iterate it.
+		if archinstall.arguments.get('services', None):
+			installation.enable_service(*archinstall.arguments['services'])
+
 		# If the user provided custom commands to be run post-installation, execute them now.
 		if archinstall.arguments.get('custom-commands', None):
 			run_custom_user_commands(archinstall.arguments['custom-commands'], installation)
-- 
cgit v1.2.3-70-g09d2


From f789a96348472ae4bfe6277d107cbc3405eba5b2 Mon Sep 17 00:00:00 2001
From: Anton Hvornum <anton@hvornum.se>
Date: Sat, 22 May 2021 19:35:57 +0200
Subject: Added in a are-we-root check at the top of guided.

---
 examples/guided.py | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'examples')

diff --git a/examples/guided.py b/examples/guided.py
index f61548e1..c5440efe 100644
--- a/examples/guided.py
+++ b/examples/guided.py
@@ -12,6 +12,9 @@ from archinstall.lib.profiles import Profile
 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)
 
 # For support reasons, we'll log the disk layout pre installation to match against post-installation layout
 archinstall.log(f"Disk states before installing: {archinstall.disk_layouts()}", level=logging.DEBUG)
-- 
cgit v1.2.3-70-g09d2


From b45efe0983387b1b00b8ac956bec3fdd1a97d9f0 Mon Sep 17 00:00:00 2001
From: Anton Hvornum <anton@hvornum.se>
Date: Sat, 22 May 2021 20:04:55 +0200
Subject: Adding a NTP option to syncronize time.

---
 examples/guided.py | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'examples')

diff --git a/examples/guided.py b/examples/guided.py
index c5440efe..a2790af3 100644
--- a/examples/guided.py
+++ b/examples/guided.py
@@ -237,6 +237,9 @@ def ask_user_questions():
 	if not archinstall.arguments.get('timezone', None):
 		archinstall.arguments['timezone'] = archinstall.ask_for_a_timezone()
 
+	if not archinstall.arguments.get('ntp', False):
+		archinstall.arguments['ntp'] = input("Would you like to use automatic time syncronization (ntp) with default time servers? N/y: ").strip().lower() in ('y', 'yes')
+
 
 def perform_installation_steps():
 	print()
@@ -369,6 +372,9 @@ def perform_installation(mountpoint):
 			if timezone := archinstall.arguments.get('timezone', None):
 				installation.set_timezone(timezone)
 
+			if archinstall.arguments.get('ntp', False):
+				installation.activate_ntp()
+
 			if (root_pw := archinstall.arguments.get('!root-password', None)) and len(root_pw):
 				installation.user_set_pw('root', root_pw)
 
-- 
cgit v1.2.3-70-g09d2


From e3a629a6ff71a7d8d3d66f66c40229ecd0e7b8e9 Mon Sep 17 00:00:00 2001
From: Anton Hvornum <anton@hvornum.se>
Date: Sat, 22 May 2021 20:07:15 +0200
Subject: Added a information that ntp might require some additional tinkering
 to work perfectly.

---
 examples/guided.py | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'examples')

diff --git a/examples/guided.py b/examples/guided.py
index a2790af3..fc2baec0 100644
--- a/examples/guided.py
+++ b/examples/guided.py
@@ -239,6 +239,8 @@ def ask_user_questions():
 
 	if not archinstall.arguments.get('ntp', False):
 		archinstall.arguments['ntp'] = input("Would you like to use automatic time syncronization (ntp) with default time servers? N/y: ").strip().lower() in ('y', 'yes')
+		if archinstall.arguments['ntp']:
+			archinstall.log("Hardware time and other post configuration might be required for ntp to work. Please see wiki!", fg="yellow")
 
 
 def perform_installation_steps():
-- 
cgit v1.2.3-70-g09d2


From 1e53f4a65f8eb5f34953006e0cdf5502a89e89c7 Mon Sep 17 00:00:00 2001
From: Anton Hvornum <anton@hvornum.se>
Date: Sat, 22 May 2021 20:10:30 +0200
Subject: Made NTP question only on timezone for now.

---
 examples/guided.py | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

(limited to 'examples')

diff --git a/examples/guided.py b/examples/guided.py
index fc2baec0..69561bfe 100644
--- a/examples/guided.py
+++ b/examples/guided.py
@@ -237,10 +237,11 @@ def ask_user_questions():
 	if not archinstall.arguments.get('timezone', None):
 		archinstall.arguments['timezone'] = archinstall.ask_for_a_timezone()
 
-	if not archinstall.arguments.get('ntp', False):
-		archinstall.arguments['ntp'] = input("Would you like to use automatic time syncronization (ntp) with default time servers? N/y: ").strip().lower() in ('y', 'yes')
-		if archinstall.arguments['ntp']:
-			archinstall.log("Hardware time and other post configuration might be required for ntp to work. Please see wiki!", fg="yellow")
+	if archinstall.arguments['timezone']:
+		if not archinstall.arguments.get('ntp', False):
+			archinstall.arguments['ntp'] = input("Would you like to use automatic time syncronization (ntp) with default time servers? N/y: ").strip().lower() in ('y', 'yes')
+			if archinstall.arguments['ntp']:
+				archinstall.log("Hardware time and other post configuration might be required for ntp to work. Please see wiki!", fg="yellow")
 
 
 def perform_installation_steps():
-- 
cgit v1.2.3-70-g09d2


From d0a37843aa2bf71f1d8eaa6cbd590aaa1a35e0bf Mon Sep 17 00:00:00 2001
From: Anton Hvornum <anton@hvornum.se>
Date: Sat, 22 May 2021 20:13:59 +0200
Subject: Rephrased according to @dylan's suggestions.

---
 examples/guided.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'examples')

diff --git a/examples/guided.py b/examples/guided.py
index 69561bfe..e60cd0f8 100644
--- a/examples/guided.py
+++ b/examples/guided.py
@@ -239,9 +239,9 @@ def ask_user_questions():
 
 	if archinstall.arguments['timezone']:
 		if not archinstall.arguments.get('ntp', False):
-			archinstall.arguments['ntp'] = input("Would you like to use automatic time syncronization (ntp) with default time servers? N/y: ").strip().lower() in ('y', 'yes')
+			archinstall.arguments['ntp'] = input("Would you like to use automatic time synchronization (NTP) with the default time servers? [Y/n]: ").strip().lower() in ('y', 'yes')
 			if archinstall.arguments['ntp']:
-				archinstall.log("Hardware time and other post configuration might be required for ntp to work. Please see wiki!", fg="yellow")
+				archinstall.log("Hardware time and other post-configuration steps might be required in order for NTP to work. For more information, please check the Arch wiki.", fg="yellow")
 
 
 def perform_installation_steps():
-- 
cgit v1.2.3-70-g09d2


From d7e23c847f4901b039b5a78c92e63ffa20b31268 Mon Sep 17 00:00:00 2001
From: Anton Hvornum <anton@hvornum.se>
Date: Sat, 22 May 2021 20:40:20 +0200
Subject: Added in the option to select system locale if --advance is given to
 guided, as it does potentially cause issues in the installation if not
 configured properly

---
 examples/guided.py | 12 ++++++++++++
 1 file changed, 12 insertions(+)

(limited to 'examples')

diff --git a/examples/guided.py b/examples/guided.py
index e60cd0f8..122f0804 100644
--- a/examples/guided.py
+++ b/examples/guided.py
@@ -51,6 +51,17 @@ def ask_user_questions():
 		selected_region = archinstall.arguments['mirror-region']
 		archinstall.arguments['mirror-region'] = {selected_region: archinstall.list_mirrors()[selected_region]}
 
+	if not archinstall.arguments.get('sys-language', None) and archinstall.arguments.get('advanced', False):
+		archinstall.arguments['sys-language'] = input("Enter a valid locale (language) for your OS, (Default: en_US): ").strip()
+		archinstall.arguments['sys-encoding'] = input("Enter a valid system default encoding for your OS, (Default: utf-8): ").strip()
+
+		if not archinstall.arguments['sys-language']:
+			archinstall.arguments['sys-language'] = 'en_US'
+		if not archinstall.arguments['sys-encoding']:
+			archinstall.arguments['sys-encoding'] = 'utf-8'
+
+		archinstall.log("Keep in mind that if you want multiple locales, post configuration is required.", fg="yellow")
+
 	# Ask which harddrive/block-device we will install to
 	if archinstall.arguments.get('harddrive', None):
 		archinstall.arguments['harddrive'] = archinstall.BlockDevice(archinstall.arguments['harddrive'])
@@ -328,6 +339,7 @@ def perform_installation(mountpoint):
 		if archinstall.arguments.get('mirror-region', None):
 			archinstall.use_mirrors(archinstall.arguments['mirror-region'])  # Set the mirrors for the live medium
 		if installation.minimal_installation():
+			installation.set_locale(archinstall.arguments['sys-language'], archinstall.arguments['sys-encoding'].upper())
 			installation.set_hostname(archinstall.arguments['hostname'])
 			if archinstall.arguments['mirror-region'].get("mirrors", None) is not None:
 				installation.set_mirrors(archinstall.arguments['mirror-region'])  # Set the mirrors in the installation medium
-- 
cgit v1.2.3-70-g09d2


From 1552cc82773b28b91a90f5023565538a2eb965bd Mon Sep 17 00:00:00 2001
From: Anton Hvornum <anton@hvornum.se>
Date: Sat, 22 May 2021 20:50:02 +0200
Subject: Re-worked the select_profile() user interaction. It no longer takes
 options as a parameter, instead it sources the profiles available, prints a
 curated list but allows for any input that is a valid profile.

---
 archinstall/lib/user_interaction.py | 14 ++++++--------
 examples/guided.py                  |  2 +-
 2 files changed, 7 insertions(+), 9 deletions(-)

(limited to 'examples')

diff --git a/archinstall/lib/user_interaction.py b/archinstall/lib/user_interaction.py
index 50c62aa9..503e9a03 100644
--- a/archinstall/lib/user_interaction.py
+++ b/archinstall/lib/user_interaction.py
@@ -563,28 +563,26 @@ def select_disk(dict_o_disks):
 	raise DiskError('select_disk() requires a non-empty dictionary of disks to select from.')
 
 
-def select_profile(options):
+def select_profile():
 	"""
 	Asks the user to select a profile from the `options` dictionary parameter.
 	Usually this is combined with :ref:`archinstall.list_profiles`.
 
-	:param options: A `dict` where keys are the profile name, value should be a dict containing profile information.
-	:type options: dict
-
 	:return: The name/dictionary key of the selected profile
 	:rtype: str
 	"""
-	profiles = sorted(list(options))
+	shown_profiles = sorted(list(archinstall.list_profiles(filter_top_level_profiles=True)))
+	actual_profiles_raw = shown_profiles + sorted([profile for profile in archinstall.list_profiles() if profile not in shown_profiles])
 
-	if len(profiles) >= 1:
-		for index, profile in enumerate(profiles):
+	if len(shown_profiles) >= 1:
+		for index, profile in enumerate(shown_profiles):
 			print(f"{index}: {profile}")
 
 		print(' -- The above list is a set of pre-programmed profiles. --')
 		print(' -- They might make it easier to install things like desktop environments. --')
 		print(' -- (Leave blank and hit enter to skip this step and continue) --')
 
-		selected_profile = generic_select(profiles, 'Enter a pre-programmed profile name if you want to install one: ', options_output=False)
+		selected_profile = generic_select(actual_profiles_raw, 'Enter a pre-programmed profile name if you want to install one: ', options_output=False)
 		if selected_profile:
 			return Profile(None, selected_profile)
 	else:
diff --git a/examples/guided.py b/examples/guided.py
index 122f0804..7d033eaf 100644
--- a/examples/guided.py
+++ b/examples/guided.py
@@ -193,7 +193,7 @@ def ask_user_questions():
 
 	# Ask for archinstall-specific profiles (such as desktop environments etc)
 	if not archinstall.arguments.get('profile', None):
-		archinstall.arguments['profile'] = archinstall.select_profile(archinstall.list_profiles(filter_top_level_profiles=True))
+		archinstall.arguments['profile'] = archinstall.select_profile()
 	else:
 		archinstall.arguments['profile'] = Profile(installer=None, path=archinstall.arguments['profile'])
 
-- 
cgit v1.2.3-70-g09d2


From a9efdac61581844e53c80d214ba88b370c2d7ee6 Mon Sep 17 00:00:00 2001
From: Anton Hvornum <anton@hvornum.se>
Date: Sat, 22 May 2021 21:00:11 +0200
Subject: Fix issue from language selection.

---
 examples/guided.py | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'examples')

diff --git a/examples/guided.py b/examples/guided.py
index 7d033eaf..a25f1b3b 100644
--- a/examples/guided.py
+++ b/examples/guided.py
@@ -54,13 +54,13 @@ def ask_user_questions():
 	if not archinstall.arguments.get('sys-language', None) and archinstall.arguments.get('advanced', False):
 		archinstall.arguments['sys-language'] = input("Enter a valid locale (language) for your OS, (Default: en_US): ").strip()
 		archinstall.arguments['sys-encoding'] = input("Enter a valid system default encoding for your OS, (Default: utf-8): ").strip()
+		archinstall.log("Keep in mind that if you want multiple locales, post configuration is required.", fg="yellow")
 
-		if not archinstall.arguments['sys-language']:
-			archinstall.arguments['sys-language'] = 'en_US'
-		if not archinstall.arguments['sys-encoding']:
-			archinstall.arguments['sys-encoding'] = 'utf-8'
+	if not archinstall.arguments['sys-language']:
+		archinstall.arguments['sys-language'] = 'en_US'
+	if not archinstall.arguments['sys-encoding']:
+		archinstall.arguments['sys-encoding'] = 'utf-8'
 
-		archinstall.log("Keep in mind that if you want multiple locales, post configuration is required.", fg="yellow")
 
 	# Ask which harddrive/block-device we will install to
 	if archinstall.arguments.get('harddrive', None):
-- 
cgit v1.2.3-70-g09d2


From 9ce4370fc72463685e25cabfd3340c92dad276a7 Mon Sep 17 00:00:00 2001
From: Anton Hvornum <anton@hvornum.se>
Date: Sat, 22 May 2021 21:00:59 +0200
Subject: Fix issue from language selection.

---
 examples/guided.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'examples')

diff --git a/examples/guided.py b/examples/guided.py
index a25f1b3b..cbf30eb3 100644
--- a/examples/guided.py
+++ b/examples/guided.py
@@ -56,9 +56,9 @@ def ask_user_questions():
 		archinstall.arguments['sys-encoding'] = input("Enter a valid system default encoding for your OS, (Default: utf-8): ").strip()
 		archinstall.log("Keep in mind that if you want multiple locales, post configuration is required.", fg="yellow")
 
-	if not archinstall.arguments['sys-language']:
+	if not archinstall.arguments.get('sys-language', None):
 		archinstall.arguments['sys-language'] = 'en_US'
-	if not archinstall.arguments['sys-encoding']:
+	if not archinstall.arguments.get('sys-encoding', None):
 		archinstall.arguments['sys-encoding'] = 'utf-8'
 
 
-- 
cgit v1.2.3-70-g09d2


From 9be8a3a998ed671749665dae3fc432305ababc64 Mon Sep 17 00:00:00 2001
From: Yash Tripathi <tripathiyash97@gmail.com>
Date: Sun, 23 May 2021 11:52:21 +0530
Subject: updated mirror-region config key to use value directly

---
 examples/guided.py | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'examples')

diff --git a/examples/guided.py b/examples/guided.py
index cbf30eb3..c6f40ac7 100644
--- a/examples/guided.py
+++ b/examples/guided.py
@@ -445,5 +445,7 @@ else:
 		archinstall.arguments['profile'] = archinstall.Profile(None, archinstall.arguments.get('profile', None))
 	else:
 		archinstall.arguments['profile'] = None
+	if archinstall.arguments.get('mirror-region', None) is not None:
+		archinstall.arguments['mirror-region'] = {selected_region: archinstall.list_mirrors()[archinstall.arguments.get('mirror-region', None)]}
 
 perform_installation_steps()
-- 
cgit v1.2.3-70-g09d2


From 87955e0ba659c46a42d7a48955054b47874b38e2 Mon Sep 17 00:00:00 2001
From: Yash Tripathi <tripathiyash97@gmail.com>
Date: Sun, 23 May 2021 11:56:19 +0530
Subject: fixed pulling mirror-region from config

---
 examples/guided.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'examples')

diff --git a/examples/guided.py b/examples/guided.py
index c6f40ac7..31d11396 100644
--- a/examples/guided.py
+++ b/examples/guided.py
@@ -446,6 +446,7 @@ else:
 	else:
 		archinstall.arguments['profile'] = None
 	if archinstall.arguments.get('mirror-region', None) is not None:
-		archinstall.arguments['mirror-region'] = {selected_region: archinstall.list_mirrors()[archinstall.arguments.get('mirror-region', None)]}
+		selected_region = archinstall.arguments.get('mirror-region', None)
+		archinstall.arguments['mirror-region'] = {selected_region: archinstall.list_mirrors()[selected_region]}
 
 perform_installation_steps()
-- 
cgit v1.2.3-70-g09d2


From 1d04acb603e46f7dcd52b5ecd6686265bbdc3059 Mon Sep 17 00:00:00 2001
From: Yash Tripathi <tripathiyash97@gmail.com>
Date: Sun, 23 May 2021 13:33:48 +0530
Subject: added pulling sys-language and sys-encoding from config

---
 examples/guided.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'examples')

diff --git a/examples/guided.py b/examples/guided.py
index 31d11396..c3e5848b 100644
--- a/examples/guided.py
+++ b/examples/guided.py
@@ -448,5 +448,7 @@ else:
 	if archinstall.arguments.get('mirror-region', None) is not None:
 		selected_region = archinstall.arguments.get('mirror-region', None)
 		archinstall.arguments['mirror-region'] = {selected_region: archinstall.list_mirrors()[selected_region]}
-
+	archinstall.arguments['sys-language'] = archinstall.arguments.get('sys-language', 'en_US')
+	archinstall.arguments['sys-encoding'] = archinstall.arguments.get('sys-encoding', 'utf-8')
+	
 perform_installation_steps()
-- 
cgit v1.2.3-70-g09d2


From 1c9adbbedfcbd821fc4f4a74f1e63699ac33d6f5 Mon Sep 17 00:00:00 2001
From: Anton Hvornum <anton@hvornum.se>
Date: Sun, 23 May 2021 11:41:55 +0200
Subject: Made sure NTP matches the default value when 'skipped'.

---
 examples/guided.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'examples')

diff --git a/examples/guided.py b/examples/guided.py
index c3e5848b..73fded4e 100644
--- a/examples/guided.py
+++ b/examples/guided.py
@@ -250,7 +250,7 @@ def ask_user_questions():
 
 	if archinstall.arguments['timezone']:
 		if not archinstall.arguments.get('ntp', False):
-			archinstall.arguments['ntp'] = input("Would you like to use automatic time synchronization (NTP) with the default time servers? [Y/n]: ").strip().lower() in ('y', 'yes')
+			archinstall.arguments['ntp'] = input("Would you like to use automatic time synchronization (NTP) with the default time servers? [Y/n]: ").strip().lower() in ('y', 'yes', '')
 			if archinstall.arguments['ntp']:
 				archinstall.log("Hardware time and other post-configuration steps might be required in order for NTP to work. For more information, please check the Arch wiki.", fg="yellow")
 
-- 
cgit v1.2.3-70-g09d2