Pulled in latest master changes

2 files changed, 22 insertions, 12 deletions

diff --git a/examples/custom-command-sample.json b/examples/custom-command-sample.json
index 5e7a70e3..f38bcca1 100644
--- a/examples/custom-command-sample.json
+++ b/examples/custom-command-sample.json
@@ -8,6 +8,7 @@
     ],
     "!encryption-password": "supersecret",
     "filesystem": "btrfs",
+    "gfx_driver": "VMware / VirtualBox (open-source)",
     "harddrive": {
         "path": "/dev/nvme0n1"
     },
@@ -16,14 +17,11 @@
         "linux"
     ],
     "keyboard-language": "us",
-    "mirror-region": {
-        "Worldwide": {
-            "https://mirror.rackspace.com/archlinux/$repo/os/$arch": true
-        }
-    },
+    "mirror-region": "Worldwide",
     "nic": {
         "NetworkManager": true
     },
+    "ntp": true,
     "packages": ["docker", "git", "wget", "zsh"],
     "profile": "gnome",
     "services": ["docker"],
@@ -32,6 +30,8 @@
             "!password": "devel"
         }
     },
+    "sys-encoding": "utf-8",
+    "sys-language": "en_US",
     "timezone": "US/Eastern",
     "users": {}
 }
diff --git a/examples/guided.py b/examples/guided.py
index 73fded4e..42429370 100644
--- a/examples/guided.py
+++ b/examples/guided.py
@@ -5,7 +5,7 @@ import time
 
 import archinstall
 from archinstall.lib.general import run_custom_user_commands
-from archinstall.lib.hardware import has_uefi
+from archinstall.lib.hardware import has_uefi, AVAILABLE_GFX_DRIVERS
 from archinstall.lib.networking import check_mirror_reachable
 from archinstall.lib.profiles import Profile
 
@@ -61,7 +61,6 @@ def ask_user_questions():
 	if not archinstall.arguments.get('sys-encoding', None):
 		archinstall.arguments['sys-encoding'] = 'utf-8'
 
-
 	# Ask which harddrive/block-device we will install to
 	if archinstall.arguments.get('harddrive', None):
 		archinstall.arguments['harddrive'] = archinstall.BlockDevice(archinstall.arguments['harddrive'])
@@ -259,7 +258,10 @@ def perform_installation_steps():
 	print()
 	print('This is your chosen configuration:')
 	archinstall.log("-- Guided template chosen (with below config) --", level=logging.DEBUG)
-	archinstall.log(json.dumps(archinstall.arguments, indent=4, sort_keys=True, cls=archinstall.JSON), level=logging.INFO)
+	user_configuration = json.dumps(archinstall.arguments, indent=4, sort_keys=True, cls=archinstall.JSON)
+	archinstall.log(user_configuration, level=logging.INFO)
+	with open("/var/log/archinstall/user_configuration.json", "w") as config_file:
+		config_file.write(user_configuration)
 	print()
 
 	if not archinstall.arguments.get('silent'):
@@ -442,13 +444,21 @@ else:
 	archinstall.arguments['harddrive'].keep_partitions = False
 	# Temporary workaround to make Desktop Environments work
 	if archinstall.arguments.get('profile', None) is not None:
-		archinstall.arguments['profile'] = archinstall.Profile(None, archinstall.arguments.get('profile', None))
+		if type(archinstall.arguments.get('profile', None)) is dict:
+			archinstall.arguments['profile'] = archinstall.Profile(None, archinstall.arguments.get('profile', None)['path'])
+		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:
-		selected_region = archinstall.arguments.get('mirror-region', None)
-		archinstall.arguments['mirror-region'] = {selected_region: archinstall.list_mirrors()[selected_region]}
+		if type(archinstall.arguments.get('mirror-region', None)) is dict:
+			archinstall.arguments['mirror-region'] = archinstall.arguments.get('mirror-region', None)
+		else:
+			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')
-	
+	if archinstall.arguments.get('gfx_driver', None) is not None:
+		archinstall.storage['gfx_driver_packages'] = AVAILABLE_GFX_DRIVERS.get(archinstall.arguments.get('gfx_driver', None), None)
+
 perform_installation_steps()