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

Optimization, safe_to_format() now checks partition.allow_formatting as a condition.

This commit is contained in:
Anton Hvornum 2021-03-08 17:14:21 +01:00
parent fb55e318e5
commit 8bf3296749
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
archinstall/lib/disk.py
View File

@ -184,7 +184,9 @@ class Partition():
return True if files > 0 else False return True if files > 0 else False
def safe_to_format(self): def safe_to_format(self):
if self.target_mountpoint == '/boot' and self.has_content(): if self.allow_formatting is False:
return False
elif self.target_mountpoint == '/boot' and self.has_content():
return False return False
return True return True

2
examples/guided.py
View File

@ -281,7 +281,7 @@ with archinstall.Filesystem(archinstall.arguments['harddrive'], archinstall.GPT)
fs.use_entire_disk(archinstall.arguments.get('filesystem', 'ext4')) fs.use_entire_disk(archinstall.arguments.get('filesystem', 'ext4'))
else: else:
for partition in archinstall.arguments['harddrive']: for partition in archinstall.arguments['harddrive']:
if partition.allow_formatting and partition.safe_to_format(): if partition.safe_to_format():
partition.format() partition.format()
else: else:
archinstall.log(f"Did not format {partition} because .safe_to_format() returned False or .allow_formatting was False", level=archinstall.LOG_LEVELS.Debug) archinstall.log(f"Did not format {partition} because .safe_to_format() returned False or .allow_formatting was False", level=archinstall.LOG_LEVELS.Debug)