From 9f7602f019891c424790a6d68a5f053fbea4b119 Mon Sep 17 00:00:00 2001 From: Nathan Whitehorn Date: Sun, 31 Dec 2017 03:13:45 +0000 Subject: [PATCH] Teach bsdinstall partedit/sade how to format FAT partitions on GPT, which have the partition type code "ms-basic-data". MFC after: 2 weeks --- usr.sbin/bsdinstall/partedit/gpart_ops.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/usr.sbin/bsdinstall/partedit/gpart_ops.c b/usr.sbin/bsdinstall/partedit/gpart_ops.c index 6ceccaf1200e..b2cfef597fd6 100644 --- a/usr.sbin/bsdinstall/partedit/gpart_ops.c +++ b/usr.sbin/bsdinstall/partedit/gpart_ops.c @@ -167,7 +167,8 @@ newfs_command(const char *fstype, char *command, int use_default) else if (strcmp(items[i].name, "atime") == 0) strcat(command, "-O atime=off "); } - } else if (strcmp(fstype, "fat32") == 0 || strcmp(fstype, "efi") == 0) { + } else if (strcmp(fstype, "fat32") == 0 || strcmp(fstype, "efi") == 0 || + strcmp(fstype, "ms-basic-data") == 0) { int i; DIALOG_LISTITEM items[] = { {"FAT32", "FAT Type 32", @@ -747,7 +748,8 @@ set_default_part_metadata(const char *name, const char *scheme, /* Get VFS from text after freebsd-, if possible */ if (strncmp("freebsd-", type, 8) == 0) md->fstab->fs_vfstype = strdup(&type[8]); - else if (strcmp("fat32", type) == 0 || strcmp("efi", type) == 0) + else if (strcmp("fat32", type) == 0 || strcmp("efi", type) == 0 + || strcmp("ms-basic-data", type) == 0) md->fstab->fs_vfstype = strdup("msdosfs"); else md->fstab->fs_vfstype = strdup(type); /* Guess */