svn commit: r329726 - head/stand/i386/loader

[Warner Losh]

Author: imp
Date: Wed Feb 21 15:58:00 2018
New Revision: 329726
URL: https://svnweb.freebsd.org/changeset/base/329726

Log:
  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.

Modified:
  head/stand/i386/loader/Makefile
  head/stand/i386/loader/conf.c

Modified: head/stand/i386/loader/Makefile
==============================================================================
--- head/stand/i386/loader/Makefile	Wed Feb 21 15:57:36 2018	(r329725)
+++ head/stand/i386/loader/Makefile	Wed Feb 21 15:58:00 2018	(r329726)
@@ -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

Modified: head/stand/i386/loader/conf.c
==============================================================================
--- head/stand/i386/loader/conf.c	Wed Feb 21 15:57:36 2018	(r329725)
+++ head/stand/i386/loader/conf.c	Wed Feb 21 15:58:00 2018	(r329726)
@@ -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