index : archinstall32 | |
Archlinux32 installer | gitolite user |
summaryrefslogtreecommitdiff |
author | Anton Hvornum <anton@hvornum.se> | 2021-06-04 15:08:04 +0200 |
---|---|---|
committer | Anton Hvornum <anton@hvornum.se> | 2021-06-04 15:08:04 +0200 |
commit | 71b6efab69cab9bd97c647c7ccc7667149967a5c (patch) | |
tree | 36d294b739d08a0b1da5fde1aee315cea87d751a /archinstall/lib/disk.py | |
parent | 7d60287a3d24303a4e4518b75058ffd2f1feca8d (diff) | |
parent | a4033a7d3a94916f2b4972d212f9d0069fca39cd (diff) |
-rw-r--r-- | archinstall/lib/disk.py | 5 |
diff --git a/archinstall/lib/disk.py b/archinstall/lib/disk.py index ac59600d..3fda5da6 100644 --- a/archinstall/lib/disk.py +++ b/archinstall/lib/disk.py @@ -353,7 +353,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() @@ -555,7 +556,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}') |