Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Girtler <blackrabbit256@gmail.com>2023-09-14 19:59:32 +1000
committerGitHub <noreply@github.com>2023-09-14 19:59:32 +1000
commit3ba1a3718e3187eafdaaaab4c1ad6551408cc701 (patch)
tree093e67b2c171128dca553107176a65a877ee1470
parent9bfd8c622a4247276d20d8578faf1fdde56879ff (diff)
Fix 1973 - pipewire (#2030)
Co-authored-by: Daniel Girtler <girtler.daniel@gmail.com>
-rw-r--r--archinstall/scripts/guided.py6
-rw-r--r--archinstall/scripts/swiss.py6
-rw-r--r--examples/interactive_installation.py6
3 files changed, 9 insertions, 9 deletions
diff --git a/archinstall/scripts/guided.py b/archinstall/scripts/guided.py
index 605d2b0e..51549fa8 100644
--- 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
index cd532f6d..80fa0a48 100644
--- 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
index e075df9b..9eac029c 100644
--- 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)