Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
path: root/archinstall/lib
diff options
context:
space:
mode:
authorWerner Llácer <wllacer@gmail.com>2022-01-15 21:44:13 +0100
committerGitHub <noreply@github.com>2022-01-15 21:44:13 +0100
commit3d30a4eb28bd84713571c52622cb88b6458076a5 (patch)
tree466c55033cb5b39ecdcedc2173aa4255fd3fd2f8 /archinstall/lib
parent31f55e8d6b0b6e7a7fe28433d7d305d58d5667a1 (diff)
Missing arguments after GlobalMenu execution (issue #868) (#871)
* Install.__init__ parameter kernel as a list everywhere. I've dropped the string check, as it shouldn't happen again, and it's good that it fails, when it happens * Global Menu now loads in the arguments dict all options enabled with default value and no manually selected (issue #868)
Diffstat (limited to 'archinstall/lib')
-rw-r--r--archinstall/lib/installer.py2
-rw-r--r--archinstall/lib/menu/selection_menu.py4
2 files changed, 4 insertions, 2 deletions
diff --git a/archinstall/lib/installer.py b/archinstall/lib/installer.py
index 32074e5c..260094c8 100644
--- a/archinstall/lib/installer.py
+++ b/archinstall/lib/installer.py
@@ -90,8 +90,6 @@ class Installer:
base_packages = __packages__[:3]
if kernels is None:
self.kernels = ['linux']
- elif isinstance(kernels,str):
- self.kernels = [kernels]
else:
self.kernels = kernels
self.target = target
diff --git a/archinstall/lib/menu/selection_menu.py b/archinstall/lib/menu/selection_menu.py
index 82e8c47e..fa997473 100644
--- a/archinstall/lib/menu/selection_menu.py
+++ b/archinstall/lib/menu/selection_menu.py
@@ -238,6 +238,10 @@ class GlobalMenu:
break
else:
self._process_selection(selection)
+ for key in self._menu_options:
+ sel = self._menu_options[key]
+ if sel.enabled and sel.has_selection() and key not in archinstall.arguments:
+ archinstall.arguments[key] = sel._current_selection
def _process_selection(self, selection):
# find the selected option in our option list