From f60cd10afbd8a0981ee0d59b7044b00be8acd8b7 Mon Sep 17 00:00:00 2001 From: Csonka Mihaly Date: Sun, 30 May 2021 17:37:44 +0200 Subject: Fix typo in error msg --- archinstall/lib/disk.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'archinstall/lib/disk.py') diff --git a/archinstall/lib/disk.py b/archinstall/lib/disk.py index 8f67111a..f4936d73 100644 --- a/archinstall/lib/disk.py +++ b/archinstall/lib/disk.py @@ -456,7 +456,7 @@ class Filesystem: if SysCommand(f'/usr/bin/parted -s {self.blockdevice.device} mklabel msdos').exit_code == 0: return self else: - raise DiskError('Problem setting the partition format to GPT:', f'/usr/bin/parted -s {self.blockdevice.device} mklabel msdos') + raise DiskError('Problem setting the partition format to MBR:', f'/usr/bin/parted -s {self.blockdevice.device} mklabel msdos') else: raise DiskError(f'Unknown mode selected to format in: {self.mode}') -- cgit v1.2.3-70-g09d2 From f1503349dabaef1d2ec721a11e997949a1959f30 Mon Sep 17 00:00:00 2001 From: "Dylan M. Taylor" Date: Thu, 3 Jun 2021 08:25:36 -0400 Subject: Attempt to avoid crashing when encountering swap partitions in has_content() --- archinstall/lib/disk.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'archinstall/lib/disk.py') diff --git a/archinstall/lib/disk.py b/archinstall/lib/disk.py index f4936d73..d0e3f6a2 100644 --- a/archinstall/lib/disk.py +++ b/archinstall/lib/disk.py @@ -254,7 +254,8 @@ class Partition: return None def has_content(self): - if not get_filesystem_type(self.path): + fs_type = get_filesystem_type(self.path) + if not fs_type or "swap" in fs_type: return False temporary_mountpoint = '/tmp/' + hashlib.md5(bytes(f"{time.time()}", 'UTF-8') + os.urandom(12)).hexdigest() -- cgit v1.2.3-70-g09d2