From 0552d040ac8fb4517d77f3fa86ec3039ab71fb4b Mon Sep 17 00:00:00 2001 From: Anton Hvornum Date: Sun, 6 Jun 2021 17:13:42 +0200 Subject: Added a json.dumps() helper that wraps JSON cls. Also tweaked the logic for the size creation so that they don't overlap --- archinstall/lib/user_interaction.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'archinstall/lib/user_interaction.py') 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" : { -- cgit v1.2.3-70-g09d2