RomanNum3ral
/
archinstall
mirror of https://github.com/archlinux/archinstall.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Make audio server selection only prompt for desktop profiles

This commit is contained in:
Dylan Taylor 2021-04-07 19:51:16 -04:00
parent 9312076cfe
commit 4c92879c1d
1 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
examples/guided.py
View File

@ -160,9 +160,16 @@ def ask_user_questions():
) )
exit(1) exit(1)
# Ask about audio server selection (this right now just asks for pipewire and defaults to pulseaudio otherwise) # Ask about audio server selection if one is not already set
if not archinstall.arguments.get('audio', None): if not archinstall.arguments.get('audio', None):
archinstall.arguments['audio'] = archinstall.ask_for_audio_selection()
# only ask for audio server selection on a desktop profile
if str(archinstall.arguments['profile']) == 'Profile(desktop)':
archinstall.arguments['audio'] = archinstall.ask_for_audio_selection()
else:
# packages installed by a profile may depend on audio and something may get installed anyways, not much we can do about that.
# we will not try to remove packages post-installation to not have audio, as that may cause multiple issues
archinstall.arguments['audio'] = 'none'
# Additional packages (with some light weight error handling for invalid package names) # Additional packages (with some light weight error handling for invalid package names)
if not archinstall.arguments.get('packages', None): if not archinstall.arguments.get('packages', None):
@ -282,13 +289,14 @@ def perform_installation(device, boot_partition, language, mirrors):
installation.enable_service('systemd-networkd') installation.enable_service('systemd-networkd')
installation.enable_service('systemd-resolved') installation.enable_service('systemd-resolved')
installation.log(f"The {archinstall.arguments.get('audio', None)} audio server will be used.", level=archinstall.LOG_LEVELS.Info) if archinstall.arguments['audio'] != 'none':
if archinstall.arguments.get('audio', None) == 'pipewire': installation.log(f"The {archinstall.arguments.get('audio', None)} audio server will be used.", level=archinstall.LOG_LEVELS.Info)
print('Installing pipewire ...') if archinstall.arguments.get('audio', None) == 'pipewire':
installation.add_additional_packages(["pipewire", "pipewire-alsa", "pipewire-docs", "pipewire-jack", "pipewire-media-session", "pipewire-pulse", "gst-plugin-pipewire", "libpulse"]) print('Installing pipewire ...')
elif archinstall.arguments.get('audio', None) == 'pulseaudio': installation.add_additional_packages(["pipewire", "pipewire-alsa", "pipewire-docs", "pipewire-jack", "pipewire-media-session", "pipewire-pulse", "gst-plugin-pipewire", "libpulse"])
print('Installing pulseaudio ...') elif archinstall.arguments.get('audio', None) == 'pulseaudio':
installation.add_additional_packages("pulseaudio") print('Installing pulseaudio ...')
installation.add_additional_packages("pulseaudio")
if archinstall.arguments.get('packages', None) and archinstall.arguments.get('packages', None)[0] != '': if archinstall.arguments.get('packages', None) and archinstall.arguments.get('packages', None)[0] != '':
installation.add_additional_packages(archinstall.arguments.get('packages', None)) installation.add_additional_packages(archinstall.arguments.get('packages', None))