diff options
| author | Joey Hess <joeyh@joeyh.name> | 2017-12-20 13:24:43 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2017-12-20 13:25:44 -0400 |
| commit | ad3cc8fb46b051e45ed51126abec4fda79a4deb6 (patch) | |
| tree | 7378b9de44c888e054542de5c79512e9a9052591 | |
| parent | 776dcf4834a9eb97b1d70b6a3e17ff2173e4bd92 (diff) | |
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.
| -rw-r--r-- | debian/changelog | 1 | ||||
| -rw-r--r-- | doc/forum/parted:_invalid_token:_fat/comment_2_88db9d05c7e4d028f35d98ba6b082d55._comment | 7 | ||||
| -rw-r--r-- | src/Propellor/Property/Parted/Types.hs | 6 |
3 files changed, 12 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog index b738f874..94cbca20 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ propellor (5.1.1) UNRELEASED; urgency=medium * bootstrappedFrom: Set up local privdata file. + * Parted: Fix names used for FAT and VFAT partitions. -- Joey Hess <id@joeyh.name> Wed, 29 Nov 2017 11:45:08 -0400 diff --git a/doc/forum/parted:_invalid_token:_fat/comment_2_88db9d05c7e4d028f35d98ba6b082d55._comment b/doc/forum/parted:_invalid_token:_fat/comment_2_88db9d05c7e4d028f35d98ba6b082d55._comment new file mode 100644 index 00000000..292a4109 --- /dev/null +++ b/doc/forum/parted:_invalid_token:_fat/comment_2_88db9d05c7e4d028f35d98ba6b082d55._comment @@ -0,0 +1,7 @@ +[[!comment format=mdwn + username="joey" + subject="""comment 2""" + date="2017-12-20T17:25:11Z" + content=""" +I went ahead and made the change in parted. +"""]] 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" |