Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
path: root/examples
diff options
context:
space:
mode:
authorAnton Hvornum <anton.feeds@gmail.com>2021-06-14 09:26:03 +0200
committerAnton Hvornum <anton.feeds@gmail.com>2021-06-14 09:26:03 +0200
commitd4f0d411f6b96ad29d367e84af6502794a92a7d9 (patch)
tree419a095de16b9a24bcb95db186f1b6f0b5f23d5f /examples
parent1450387fae158610dfe40a489579951ce071c260 (diff)
parent8489137b878aa920c3b6e9c567146f2c95d7981b (diff)
Synced master into partitioning branch
Diffstat (limited to 'examples')
-rw-r--r--examples/guided.py17
1 files changed, 6 insertions, 11 deletions
diff --git a/examples/guided.py b/examples/guided.py
index 4136ca6e..0d409657 100644
--- a/examples/guided.py
+++ b/examples/guided.py
@@ -7,7 +7,7 @@ import archinstall
from archinstall.lib.general import run_custom_user_commands
from archinstall.lib.hardware import *
from archinstall.lib.networking import check_mirror_reachable
-from archinstall.lib.profiles import Profile
+from archinstall.lib.profiles import Profile, is_desktop_profile
if archinstall.arguments.get('help'):
print("See `man archinstall` for help.")
@@ -136,13 +136,8 @@ def ask_user_questions():
# Ask about audio server selection if one is not already set
if not archinstall.arguments.get('audio', None):
- # 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
+ # The argument to ask_for_audio_selection lets the library know if it's a desktop profile
+ archinstall.arguments['audio'] = archinstall.ask_for_audio_selection(is_desktop_profile(archinstall.arguments['profile']))
# Ask for preferred kernel:
@@ -196,10 +191,10 @@ def perform_filesystem_operations():
with open("/var/log/archinstall/user_configuration.json", "w") as config_file:
config_file.write(user_configuration)
print()
-
+
if archinstall.arguments.get('dry_run'):
exit(0)
-
+
if not archinstall.arguments.get('silent'):
input('Press Enter to continue.')
@@ -340,7 +335,7 @@ if not check_mirror_reachable():
archinstall.log(f"Arch Linux mirrors are not reachable. Please check your internet connection and the log file '{log_file}'.", level=logging.INFO, fg="red")
exit(1)
-if archinstall.arguments.get('silent', None) is None:
+if not archinstall.arguments.get('silent'):
ask_user_questions()
else:
# Workarounds if config is loaded from a file