Fix 1973 - pipewire (#2030)

Co-authored-by: Daniel Girtler <[email protected]>
archlinux · Sep 14, 2023 · 3ba1a37 · 3ba1a37
1 parent 9bfd8c6
commit 3ba1a37
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/archinstall/scripts/guided.py b/archinstall/scripts/guided.py
@@ -166,9 +166,6 @@ def perform_installation(mountpoint: Path):
 				archinstall.arguments.get('profile_config', None)
 			)
 
-		if archinstall.arguments.get('packages', None) and archinstall.arguments.get('packages', None)[0] != '':
-			installation.add_additional_packages(archinstall.arguments.get('packages', None))
-
 		if users := archinstall.arguments.get('!users', None):
 			installation.create_users(users)
 
@@ -178,6 +175,9 @@ def perform_installation(mountpoint: Path):
 		else:
 			info("No audio server will be installed")
 
+		if archinstall.arguments.get('packages', None) and archinstall.arguments.get('packages', None)[0] != '':
+			installation.add_additional_packages(archinstall.arguments.get('packages', None))
+
 		if profile_config := archinstall.arguments.get('profile_config', None):
 			profile_handler.install_profile_config(installation, profile_config)
 

diff --git a/archinstall/scripts/swiss.py b/archinstall/scripts/swiss.py
@@ -230,9 +230,6 @@ def perform_installation(mountpoint: Path, exec_mode: ExecutionMode):
 					archinstall.arguments.get('profile_config', None)
 				)
 
-			if archinstall.arguments.get('packages', None) and archinstall.arguments.get('packages', None)[0] != '':
-				installation.add_additional_packages(archinstall.arguments.get('packages', []))
-
 			if users := archinstall.arguments.get('!users', None):
 				installation.create_users(users)
 
@@ -242,6 +239,9 @@ def perform_installation(mountpoint: Path, exec_mode: ExecutionMode):
 			else:
 				info("No audio server will be installed")
 
+			if archinstall.arguments.get('packages', None) and archinstall.arguments.get('packages', None)[0] != '':
+				installation.add_additional_packages(archinstall.arguments.get('packages', []))
+
 			if profile_config := archinstall.arguments.get('profile_config', None):
 				profile_handler.install_profile_config(installation, profile_config)
 

diff --git a/examples/interactive_installation.py b/examples/interactive_installation.py
@@ -144,9 +144,6 @@ def perform_installation(mountpoint: Path):
 				archinstall.arguments.get('profile_config', None)
 			)
 
-		if archinstall.arguments.get('packages', None) and archinstall.arguments.get('packages', None)[0] != '':
-			installation.add_additional_packages(archinstall.arguments.get('packages', []))
-
 		if users := archinstall.arguments.get('!users', None):
 			installation.create_users(users)
 
@@ -156,6 +153,9 @@ def perform_installation(mountpoint: Path):
 		else:
 			info("No audio server will be installed")
 
+		if archinstall.arguments.get('packages', None) and archinstall.arguments.get('packages', None)[0] != '':
+			installation.add_additional_packages(archinstall.arguments.get('packages', []))
+
 		if profile_config := archinstall.arguments.get('profile_config', None):
 			profile.profile_handler.install_profile_config(installation, profile_config)