RomanNum3ral
/
archinstall
mirror of https://github.com/archlinux/archinstall.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Added a json.dumps() helper that wraps JSON cls. Also tweaked the logic for the size creation so that they don't overlap

This commit is contained in:
Anton Hvornum 2021-06-06 17:13:42 +02:00
parent ce4b1fbcff
commit 0552d040ac
3 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
archinstall/lib/general.py
View File

@ -44,6 +44,8 @@ def locate_binary(name):
raise RequirementError(f"Binary {name} does not exist.") raise RequirementError(f"Binary {name} does not exist.")
def json_dumps(*args, **kwargs):
return json.dumps(*args, **{**kwargs, 'cls': JSON})
class JsonEncoder: class JsonEncoder:
def _encode(obj): def _encode(obj):
@ -86,7 +88,6 @@ class JSON(json.JSONEncoder, json.JSONDecoder):
def encode(self, obj): def encode(self, obj):
return super(JSON, self).encode(self._encode(obj)) return super(JSON, self).encode(self._encode(obj))
class SysCommandWorker: class SysCommandWorker:
def __init__(self, cmd, callbacks=None, peak_output=False, environment_vars=None, logfile=None, working_directory='./'): def __init__(self, cmd, callbacks=None, peak_output=False, environment_vars=None, logfile=None, working_directory='./'):
if not callbacks: if not callbacks:

6
archinstall/lib/user_interaction.py
View File

@ -633,8 +633,8 @@ def get_default_partition_layout(block_devices):
"type" : "primary", "type" : "primary",
"start" : "513MiB", "start" : "513MiB",
"encrypted" : True, "encrypted" : True,
"size" : f"{max(block_devices[0].size*0.2, 20)}GiB", "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" : "", "mountpoint" : "/",
"filesystem" : { "filesystem" : {
"format" : "btrfs" "format" : "btrfs"
} }
@ -642,7 +642,7 @@ def get_default_partition_layout(block_devices):
{ # Home { # Home
"type" : "primary", "type" : "primary",
"encrypted" : True, "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%", "size" : "100%",
"mountpoint" : "/home", "mountpoint" : "/home",
"filesystem" : { "filesystem" : {

2
examples/guided.py
View File

@ -82,6 +82,8 @@ def ask_user_questions():
if archinstall.arguments.get('harddrives', None): if archinstall.arguments.get('harddrives', None):
archinstall.storage['disk_layouts'] = archinstall.select_disk_layout(archinstall.arguments['harddrives']) archinstall.storage['disk_layouts'] = archinstall.select_disk_layout(archinstall.arguments['harddrives'])
print(archinstall.arguments['harddrives'])
print(archinstall.storage['disk_layouts'])
exit(0) exit(0)
# Get disk encryption password (or skip if blank) # Get disk encryption password (or skip if blank)