From ad4101f603eb6a2b7e7100d1e680eaafb38ab79a Mon Sep 17 00:00:00 2001
From: imp <imp@FreeBSD.org>
Date: Wed, 21 Feb 2018 15:58:00 +0000
Subject: [PATCH] Honor settings for including / excluding cd9660, ufs, ext2fs
 and msdos.

The Makefile gives the impression that ext2fs and msdos were excluded
(they weren't) and that you could exclude cd9660 and ufs support (you
couldn't). Allow those to be excluded.

We need to look, in the future, at trimming the number of supported
filesystems, and this will make that easier.
---
 stand/i386/loader/Makefile | 6 +++---
 stand/i386/loader/conf.c   | 8 ++++++++
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/stand/i386/loader/Makefile b/stand/i386/loader/Makefile
index 92ac5b90449a..ac30415dfd7f 100644
--- a/stand/i386/loader/Makefile
+++ b/stand/i386/loader/Makefile
@@ -5,9 +5,9 @@ HAVE_GELI=		yes
 LOADER_NET_SUPPORT?=	yes
 LOADER_NFS_SUPPORT?=	yes
 LOADER_TFTP_SUPPORT?=	yes
-LOADER_CD9660_SUPPORT?=	no
-LOADER_EXT2FS_SUPPORT?=	no
-LOADER_MSDOS_SUPPORT?=	no
+LOADER_CD9660_SUPPORT?=	yes
+LOADER_EXT2FS_SUPPORT?=	yes
+LOADER_MSDOS_SUPPORT?=	yes
 LOADER_UFS_SUPPORT?=	yes
 LOADER_GZIP_SUPPORT?=	yes
 LOADER_BZIP2_SUPPORT?=	yes
diff --git a/stand/i386/loader/conf.c b/stand/i386/loader/conf.c
index 29ce1e332605..821b239cdb2f 100644
--- a/stand/i386/loader/conf.c
+++ b/stand/i386/loader/conf.c
@@ -69,10 +69,18 @@ struct fs_ops *file_system[] = {
 #if defined(LOADER_ZFS_SUPPORT)
     &zfs_fsops,
 #endif
+#if defined(LOADER_UFS_SUPPORT)
     &ufs_fsops,
+#endif
+#if defined(LOADER_EXT2FS_SUPPORT)
     &ext2fs_fsops,
+#endif
+#if defined(LOADER_MSDOS_SUPPORT)
     &dosfs_fsops,
+#endif
+#if defined(LOADER_CD9660_SUPPORT)
     &cd9660_fsops,
+#endif
 #if defined(LOADER_NANDFS_SUPPORT)
     &nandfs_fsops,
 #endif