Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
path: root/examples
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 /examples
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 'examples')
-rw-r--r--examples/guided.py8
-rw-r--r--examples/only_hd.py2
2 files changed, 5 insertions, 5 deletions
diff --git a/examples/guided.py b/examples/guided.py
index 5ab87d9f..ea07c454 100644
--- a/examples/guided.py
+++ b/examples/guided.py
@@ -138,7 +138,7 @@ def save_user_configurations():
with open("/var/log/archinstall/user_configuration.json", "w") as config_file:
config_file.write(user_configuration)
-
+
if archinstall.arguments.get('disk_layouts'):
user_disk_layout = json.dumps(archinstall.arguments['disk_layouts'], indent=4, sort_keys=True, cls=archinstall.JSON)
with open("/var/log/archinstall/user_disk_layout.json", "w") as disk_layout_file:
@@ -148,10 +148,10 @@ def perform_filesystem_operations():
print()
print('This is your chosen configuration:')
archinstall.log("-- Guided template chosen (with below config) --", level=logging.DEBUG)
-
+
user_configuration = json.dumps({**archinstall.arguments, 'version' : archinstall.__version__} , indent=4, sort_keys=True, cls=archinstall.JSON)
archinstall.log(user_configuration, level=logging.INFO)
-
+
if archinstall.arguments.get('disk_layouts'):
user_disk_layout = json.dumps(archinstall.arguments['disk_layouts'], indent=4, sort_keys=True, cls=archinstall.JSON)
archinstall.log(user_disk_layout, level=logging.INFO)
@@ -192,7 +192,7 @@ def perform_installation(mountpoint):
Only requirement is that the block devices are
formatted and setup prior to entering this function.
"""
- with archinstall.Installer(mountpoint, kernels=archinstall.arguments.get('kernels', 'linux')) as installation:
+ with archinstall.Installer(mountpoint, kernels=archinstall.arguments.get('kernels', ['linux'])) as installation:
# Mount all the drives to the desired mountpoint
# This *can* be done outside of the installation, but the installer can deal with it.
if archinstall.arguments.get('disk_layouts'):
diff --git a/examples/only_hd.py b/examples/only_hd.py
index addb1d67..962787ba 100644
--- a/examples/only_hd.py
+++ b/examples/only_hd.py
@@ -174,7 +174,7 @@ def perform_installation(mountpoint):
Only requirement is that the block devices are
formatted and setup prior to entering this function.
"""
- with archinstall.Installer(mountpoint, kernels=archinstall.arguments.get('kernels', 'linux')) as installation:
+ with archinstall.Installer(mountpoint, kernels=None) as installation:
# Mount all the drives to the desired mountpoint
# This *can* be done outside of the installation, but the installer can deal with it.
if archinstall.storage.get('disk_layouts'):