Removing part of the old formatting scheme. New implementation roughly 80% done.

This commit is contained in:
Anton Hvornum 2021-03-08 16:18:56 +01:00
parent 979d162551
commit 0b3879ac58
2 changed files with 13 additions and 13 deletions

View File

@ -173,11 +173,13 @@ class Partition():
else:
return f'Partition(path={self.path}, fs={self.filesystem}{mount_repr})'
def format(self, filesystem, path=None, allow_formatting=None, log_formating=True):
def format(self, filesystem=None, path=None, allow_formatting=None, log_formating=True):
"""
Format can be given an overriding path, for instance /dev/null to test
the formating functionality and in essence the support for the given filesystem.
"""
if filesystem is None:
filesystem = self.filesystem
if path is None:
path = self.path
if allow_formatting is None:

View File

@ -271,19 +271,17 @@ signal.signal(signal.SIGINT, original_sigint_handler)
Once that's done, we'll hand over to perform_installation()
"""
with archinstall.Filesystem(archinstall.arguments['harddrive'], archinstall.GPT) as fs:
for partition in archinstall.arguments['harddrive']:
print(partition)
exit(0)
# Use partitioning helper to set up the disk partitions.
if disk_password:
fs.use_entire_disk('luks2')
if archinstall.arguments['harddrive'].keep_partitions is False:
if disk_password:
fs.use_entire_disk('luks2')
else:
fs.use_entire_disk('ext4')
else:
fs.use_entire_disk('ext4')
if harddrive.partition[1].size == '512M':
raise OSError('Trying to encrypt the boot partition for petes sake..')
harddrive.partition[0].format('vfat')
for partition in archinstall.arguments['harddrive']:
if partition.allow_formatting:
partition.format()
exit(0)
if disk_password:
# First encrypt and unlock, then format the desired partition inside the encrypted part.
# archinstall.luks2() encrypts the partition when entering the with context manager, and