napcok/calamares
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #759 from Psy-Kai/master

Browse Source 
Fix unknown partition-type Fat32 at mount and in fstab
This commit is contained in:
Adriaan de Groot 2017-07-03 11:33:52 -04:00 committed by GitHub
commit c9c4e4d064
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/modules/fstab/main.py
View File

@ -224,7 +224,7 @@ class FstabGenerator(object):
def generate_fstab_line_info(self, partition): def generate_fstab_line_info(self, partition):
""" Generates information for each fstab entry. """ """ Generates information for each fstab entry. """
filesystem = partition["fs"] filesystem = partition["fs"].lower()
mount_point = partition["mountPoint"] mount_point = partition["mountPoint"]
disk_name = disk_name_for_partition(partition) disk_name = disk_name_for_partition(partition)
is_ssd = disk_name in self.ssd_disks is_ssd = disk_name in self.ssd_disks

2
src/modules/mount/main.py
View File

@ -38,7 +38,7 @@ def mount_partitions(root_mount_point, partitions):
# Create mount point with `+` rather than `os.path.join()` because # Create mount point with `+` rather than `os.path.join()` because
# `partition["mountPoint"]` starts with a '/'. # `partition["mountPoint"]` starts with a '/'.
mount_point = root_mount_point + partition["mountPoint"] mount_point = root_mount_point + partition["mountPoint"]
fstype = partition.get("fs", "") fstype = partition.get("fs", "").lower()
if fstype == "fat16" or fstype == "fat32": if fstype == "fat16" or fstype == "fat32":
fstype = "vfat" fstype = "vfat"