Merging in latest changes from master and resolved conflicts.

1 files changed, 8 insertions, 7 deletions

diff --git a/profiles/52-54-00-12-34-56.py b/profiles/52-54-00-12-34-56.py
index a3347760..68e15720 100644
--- a/profiles/52-54-00-12-34-56.py
+++ b/profiles/52-54-00-12-34-56.py
@@ -1,13 +1,14 @@
 import archinstall
-import json
-import urllib.request
+
+# import json
+# import urllib.request
 
 __packages__ = ['nano', 'wget', 'git']
 
 if __name__ == '52-54-00-12-34-56':
-	awesome = archinstall.Application(installation, 'postgresql')
+	awesome = archinstall.Application(archinstall.storage['installation_session'], 'postgresql')
 	awesome.install()
-	
+
 """
 # Unmount and close previous runs (Mainly only used for re-runs, but won't hurt.)
 archinstall.sys_command(f'umount -R /mnt', suppress_errors=True)
@@ -22,12 +23,12 @@ with archinstall.Filesystem(harddrive) as fs:
 	fs.use_entire_disk('luks2')
 
 	if harddrive.partition[1].size == '512M':
-		raise OSError('Trying to encrypt the boot partition for petes sake..')
+		raise OSError('Trying to encrypt the boot partition for Pete's sake..')
 	harddrive.partition[0].format('fat32')
 
 	with archinstall.luks2(harddrive.partition[1], 'luksloop', disk_password) as unlocked_device:
 		unlocked_device.format('btrfs')
-		
+
 		with archinstall.Installer(
 				unlocked_device,
 				boot_partition=harddrive.partition[0],
@@ -57,4 +58,4 @@ with archinstall.Filesystem(harddrive) as fs:
 					urllib.request.urlopen(req, timeout=5)
 				except:
 					pass
-"""
\ No newline at end of file
+"""