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

Merge pull request #756 from Firminator/patch-1 

Update filesystem.py
This commit is contained in:
Anton Hvornum 2021-11-23 06:46:11 +00:00 committed by GitHub
parent 2be4576c42 7774165b96
commit e156971191
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
archinstall/lib/disk/filesystem.py
View File

@ -152,7 +152,7 @@ class Filesystem:
if self.mode == MBR: if self.mode == MBR:
if len(self.blockdevice.partitions) > 3: if len(self.blockdevice.partitions) > 3:
DiskError("Too many partitions on disk, MBR disks can only have 3 parimary partitions") DiskError("Too many partitions on disk, MBR disks can only have 3 primary partitions")
if partition_format: if partition_format:
parted_string = f'{self.blockdevice.device} mkpart {partition_type} {partition_format} {start} {end}' parted_string = f'{self.blockdevice.device} mkpart {partition_type} {partition_format} {start} {end}'
@ -178,10 +178,10 @@ class Filesystem:
raise err raise err
else: else:
count += 1 count += 1
log(f"Could not get uuid for partition. Waiting for the {count} time",level=logging.DEBUG) log(f"Could not get UUID for partition. Waiting for the {count} time",level=logging.DEBUG)
time.sleep(float(storage['arguments'].get('disk-sleep', 0.2))) time.sleep(float(storage['arguments'].get('disk-sleep', 0.2)))
else: else:
log("Add partition exiting due to excesive wait time",level=logging.INFO) log("Add partition is exiting due to excessive wait time",level=logging.INFO)
raise DiskError(f"New partition never showed up after adding new partition on {self}.") raise DiskError(f"New partition never showed up after adding new partition on {self}.")
def set_name(self, partition: int, name: str): def set_name(self, partition: int, name: str):
@ -192,7 +192,7 @@ class Filesystem:
return self.parted(f'{self.blockdevice.device} set {partition + 1} {string}') == 0 return self.parted(f'{self.blockdevice.device} set {partition + 1} {string}') == 0
def parted_mklabel(self, device: str, disk_label: str): def parted_mklabel(self, device: str, disk_label: str):
log(f"Creating a new partition labling on {device}", level=logging.INFO, fg="yellow") log(f"Creating a new partition label on {device}", level=logging.INFO, fg="yellow")
# Try to unmount devices before attempting to run mklabel # Try to unmount devices before attempting to run mklabel
try: try:
SysCommand(f'bash -c "umount {device}?"') SysCommand(f'bash -c "umount {device}?"')