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

Added some debugging.

This commit is contained in:
Anton Hvornum 2021-03-08 14:55:21 +01:00
parent 476006abe8
commit 1d913f50ed
2 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
archinstall/lib/disk.py
View File

@ -272,13 +272,14 @@ class Filesystem():
self.mode = mode self.mode = mode
def __enter__(self, *args, **kwargs): def __enter__(self, *args, **kwargs):
if self.mode == GPT: #if self.mode == GPT:
if sys_command(f'/usr/bin/parted -s {self.blockdevice.device} mklabel gpt',).exit_code == 0: # if sys_command(f'/usr/bin/parted -s {self.blockdevice.device} mklabel gpt',).exit_code == 0:
return self # return self
else: # else:
raise DiskError(f'Problem setting the partition format to GPT:', f'/usr/bin/parted -s {self.blockdevice.device} mklabel gpt') # raise DiskError(f'Problem setting the partition format to GPT:', f'/usr/bin/parted -s {self.blockdevice.device} mklabel gpt')
else: #else:
raise DiskError(f'Unknown mode selected to format in: {self.mode}') # raise DiskError(f'Unknown mode selected to format in: {self.mode}')
print('Keep partitions:', self.blockdevice.keep_partitions)
def __repr__(self): def __repr__(self):
return f"Filesystem(blockdevice={self.blockdevice}, mode={self.mode})" return f"Filesystem(blockdevice={self.blockdevice}, mode={self.mode})"

5
examples/guided.py
View File

@ -266,12 +266,13 @@ for i in range(5, 0, -1):
print() print()
signal.signal(signal.SIGINT, original_sigint_handler) signal.signal(signal.SIGINT, original_sigint_handler)
exit(0)
""" """
Setup the blockdevice, filesystem (and optionally encryption). Setup the blockdevice, filesystem (and optionally encryption).
Once that's done, we'll hand over to perform_installation() Once that's done, we'll hand over to perform_installation()
""" """
with archinstall.Filesystem(harddrive, archinstall.GPT) as fs: with archinstall.Filesystem(archinstall.arguments['harddrive'], archinstall.GPT) as fs:
print('Debug')
exit(0)
# Use partitioning helper to set up the disk partitions. # Use partitioning helper to set up the disk partitions.
if disk_password: if disk_password:
fs.use_entire_disk('luks2') fs.use_entire_disk('luks2')