Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnton Hvornum <anton.feeds@gmail.com>2021-03-08 14:55:21 +0100
committerAnton Hvornum <anton.feeds@gmail.com>2021-03-08 14:55:21 +0100
commit1d913f50ed630c7a1a2985e6ed8b9f4aa0bc08dd (patch)
tree635a42d2f56d88162c2283bbfbb1de886ed7f81c
parent476006abe8060235299fd3bddbfe69e597f7f988 (diff)
Added some debugging.
-rw-r--r--archinstall/lib/disk.py15
-rw-r--r--examples/guided.py5
2 files changed, 11 insertions, 9 deletions
diff --git a/archinstall/lib/disk.py b/archinstall/lib/disk.py
index d76c6d7e..e77f2cd1 100644
--- a/archinstall/lib/disk.py
+++ b/archinstall/lib/disk.py
@@ -272,13 +272,14 @@ class Filesystem():
self.mode = mode
def __enter__(self, *args, **kwargs):
- if self.mode == GPT:
- if sys_command(f'/usr/bin/parted -s {self.blockdevice.device} mklabel gpt',).exit_code == 0:
- return self
- else:
- raise DiskError(f'Problem setting the partition format to GPT:', f'/usr/bin/parted -s {self.blockdevice.device} mklabel gpt')
- else:
- raise DiskError(f'Unknown mode selected to format in: {self.mode}')
+ #if self.mode == GPT:
+ # if sys_command(f'/usr/bin/parted -s {self.blockdevice.device} mklabel gpt',).exit_code == 0:
+ # return self
+ # else:
+ # raise DiskError(f'Problem setting the partition format to GPT:', f'/usr/bin/parted -s {self.blockdevice.device} mklabel gpt')
+ #else:
+ # raise DiskError(f'Unknown mode selected to format in: {self.mode}')
+ print('Keep partitions:', self.blockdevice.keep_partitions)
def __repr__(self):
return f"Filesystem(blockdevice={self.blockdevice}, mode={self.mode})"
diff --git a/examples/guided.py b/examples/guided.py
index 0077b505..fbe6ea47 100644
--- a/examples/guided.py
+++ b/examples/guided.py
@@ -266,12 +266,13 @@ for i in range(5, 0, -1):
print()
signal.signal(signal.SIGINT, original_sigint_handler)
-exit(0)
"""
Setup the blockdevice, filesystem (and optionally encryption).
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.
if disk_password:
fs.use_entire_disk('luks2')