Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
path: root/archinstall/lib
diff options
context:
space:
mode:
authorAnton Hvornum <anton@hvornum.se>2021-06-06 17:13:42 +0200
committerAnton Hvornum <anton@hvornum.se>2021-06-06 17:13:42 +0200
commit0552d040ac8fb4517d77f3fa86ec3039ab71fb4b (patch)
tree889618fbaa89a09c8b0eec2367fb039ba8369dea /archinstall/lib
parentce4b1fbcff00a3029de06f4b20e60dcaa9e3af93 (diff)
Added a json.dumps() helper that wraps JSON cls. Also tweaked the logic for the size creation so that they don't overlap
Diffstat (limited to 'archinstall/lib')
-rw-r--r--archinstall/lib/general.py3
-rw-r--r--archinstall/lib/user_interaction.py6
2 files changed, 5 insertions, 4 deletions
diff --git a/archinstall/lib/general.py b/archinstall/lib/general.py
index f72311c9..6bb3b101 100644
--- a/archinstall/lib/general.py
+++ b/archinstall/lib/general.py
@@ -44,6 +44,8 @@ def locate_binary(name):
raise RequirementError(f"Binary {name} does not exist.")
+def json_dumps(*args, **kwargs):
+ return json.dumps(*args, **{**kwargs, 'cls': JSON})
class JsonEncoder:
def _encode(obj):
@@ -86,7 +88,6 @@ class JSON(json.JSONEncoder, json.JSONDecoder):
def encode(self, obj):
return super(JSON, self).encode(self._encode(obj))
-
class SysCommandWorker:
def __init__(self, cmd, callbacks=None, peak_output=False, environment_vars=None, logfile=None, working_directory='./'):
if not callbacks:
diff --git a/archinstall/lib/user_interaction.py b/archinstall/lib/user_interaction.py
index e28b66b2..30fb7e51 100644
--- a/archinstall/lib/user_interaction.py
+++ b/archinstall/lib/user_interaction.py
@@ -633,8 +633,8 @@ def get_default_partition_layout(block_devices):
"type" : "primary",
"start" : "513MiB",
"encrypted" : True,
- "size" : f"{max(block_devices[0].size*0.2, 20)}GiB",
- "mountpoint" : "",
+ "size" : f"{max(block_devices[0].size*0.2, 20)*1024}MiB", # Warning: Won't work on small where max size is 16GB for instance.
+ "mountpoint" : "/",
"filesystem" : {
"format" : "btrfs"
}
@@ -642,7 +642,7 @@ def get_default_partition_layout(block_devices):
{ # Home
"type" : "primary",
"encrypted" : True,
- "start" : f"{max(block_devices[0].size*0.2, 20)}GiB",
+ "start" : f"{513 + (max(block_devices[0].size*0.2, 20)*1024)}MiB",
"size" : "100%",
"mountpoint" : "/home",
"filesystem" : {