summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGiuseppe Ghibò <ghibo@mageia.org>2023-03-31 19:11:08 +0200
committerGiuseppe Ghibò <ghibo@mageia.org>2023-04-08 12:39:14 +0200
commitbd39d8c999915cad90869d9a4f653c715ea41220 (patch)
tree9173afdf059de22facf119ecb643da306abbb3c4
parente56a92884ebad8ce742393425d254a299c4bcd74 (diff)
downloaddrakx-bd39d8c999915cad90869d9a4f653c715ea41220.tar
drakx-bd39d8c999915cad90869d9a4f653c715ea41220.tar.gz
drakx-bd39d8c999915cad90869d9a4f653c715ea41220.tar.bz2
drakx-bd39d8c999915cad90869d9a4f653c715ea41220.tar.xz
drakx-bd39d8c999915cad90869d9a4f653c715ea41220.zip
Reorder services disabling in disable_all_pipewire()
-rw-r--r--perl-install/harddrake/sound.pm12
1 files changed, 6 insertions, 6 deletions
diff --git a/perl-install/harddrake/sound.pm b/perl-install/harddrake/sound.pm
index ec4823372..6cdefc266 100644
--- a/perl-install/harddrake/sound.pm
+++ b/perl-install/harddrake/sound.pm
@@ -356,10 +356,8 @@ sub disable_all_pipewire {
rooted('/usr/bin/systemctl', '--global', 'disable', 'wireplumber.service');
}
- if ($in->do_pkgs->is_installed('pipewire')) {
- foreach ('pipewire.socket', 'pipewire.service') {
- rooted('/usr/bin/systemctl', '--global', 'disable', $_);
- }
+ if ($in->do_pkgs->is_installed('pipewire-media-session')) {
+ rooted('/usr/bin/systemctl', '--global', 'disable', 'pipewire-media-session.service');
}
if ($in->do_pkgs->is_installed('pipewire-pulseaudio')) {
@@ -368,8 +366,10 @@ sub disable_all_pipewire {
}
}
- if ($in->do_pkgs->is_installed('pipewire-media-session')) {
- rooted('/usr/bin/systemctl', '--global', 'disable', 'pipewire-media-session.service');
+ if ($in->do_pkgs->is_installed('pipewire')) {
+ foreach ('pipewire.socket', 'pipewire.service') {
+ rooted('/usr/bin/systemctl', '--global', 'disable', $_);
+ }
}
}