Merging in latest changes from master and resolved conflicts.

1 files changed, 12 insertions, 5 deletions

diff --git a/profiles/xfce4.py b/profiles/xfce4.py
index 8102919b..8dbb04ec 100644
--- a/profiles/xfce4.py
+++ b/profiles/xfce4.py
@@ -1,11 +1,17 @@
-
 # A desktop environment using "Xfce4"
 
 import archinstall
 
 is_top_level_profile = False
 
-__packages__ = ["xfce4", "xfce4-goodies", "lightdm", "lightdm-gtk-greeter"]
+__packages__ = [
+	"xfce4",
+	"xfce4-goodies",
+	"pavucontrol",
+	"lightdm",
+	"lightdm-gtk-greeter",
+]
+
 
 def _prep_function(*args, **kwargs):
 	"""
@@ -23,14 +29,15 @@ def _prep_function(*args, **kwargs):
 		else:
 			print('Deprecated (??): xorg profile has no _prep_function() anymore')
 
+
 # Ensures that this code only gets executed if executed
 # through importlib.util.spec_from_file_location("xfce4", "/somewhere/xfce4.py")
 # or through conventional import xfce4
 if __name__ == 'xfce4':
 	# Install dependency profiles
-	installation.install_profile('xorg')
+	archinstall.storage['installation_session'].install_profile('xorg')
 
 	# Install the XFCE4 packages
-	installation.add_additional_packages(__packages__)
+	archinstall.storage['installation_session'].add_additional_packages(__packages__)
 
-	installation.enable_service('lightdm') # Light Display Manager
+	archinstall.storage['installation_session'].enable_service('lightdm')  # Light Display Manager