From ad3cc8fb46b051e45ed51126abec4fda79a4deb6 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Wed, 20 Dec 2017 13:24:43 -0400 Subject: Parted: Fix names used for FAT and VFAT partitions. Use "fat32" for both; these are not distinguished at the partition table level. This commit was sponsored by Henrik Riomar on Patreon. --- src/Propellor/Property/Parted/Types.hs | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'src/Propellor') diff --git a/src/Propellor/Property/Parted/Types.hs b/src/Propellor/Property/Parted/Types.hs index 3350e008..e32df310 100644 --- a/src/Propellor/Property/Parted/Types.hs +++ b/src/Propellor/Property/Parted/Types.hs @@ -106,6 +106,8 @@ instance PartedVal Bool where pval True = "on" pval False = "off" +-- This is used for creating partitions, not formatting partitions, +-- so it's ok to use eg, fat32 for both FAT and VFAT. instance PartedVal Partition.Fs where pval Partition.EXT2 = "ext2" pval Partition.EXT3 = "ext3" @@ -113,7 +115,7 @@ instance PartedVal Partition.Fs where pval Partition.BTRFS = "btrfs" pval Partition.REISERFS = "reiserfs" pval Partition.XFS = "xfs" - pval Partition.FAT = "fat" - pval Partition.VFAT = "vfat" + pval Partition.FAT = "fat32" + pval Partition.VFAT = "fat32" pval Partition.NTFS = "ntfs" pval Partition.LinuxSwap = "linux-swap" -- cgit v1.2.3