svn commit: r277946 - in stable/10/sys/boot: i386/loader pc98/loader

[John Baldwin]

Author: jhb
Date: Fri Jan 30 18:55:05 2015
New Revision: 277946
URL: https://svnweb.freebsd.org/changeset/base/277946

Log:
  MFC 274398,274537:
  Move NFS and TFTP filesystems before the synthetic filesystems (bzip,
  gzip, and split).

Modified:
  stable/10/sys/boot/i386/loader/conf.c
  stable/10/sys/boot/pc98/loader/conf.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/boot/i386/loader/conf.c
==============================================================================
--- stable/10/sys/boot/i386/loader/conf.c	Fri Jan 30 18:34:56 2015	(r277945)
+++ stable/10/sys/boot/i386/loader/conf.c	Fri Jan 30 18:55:05 2015	(r277946)
@@ -80,8 +80,11 @@ struct fs_ops *file_system[] = {
 #if defined(LOADER_NANDFS_SUPPORT)
     &nandfs_fsops,
 #endif
-#ifdef LOADER_SPLIT_SUPPORT
-    &splitfs_fsops,
+#ifdef LOADER_NFS_SUPPORT 
+    &nfs_fsops,
+#endif
+#ifdef LOADER_TFTP_SUPPORT
+    &tftp_fsops,
 #endif
 #ifdef LOADER_GZIP_SUPPORT
     &gzipfs_fsops,
@@ -89,11 +92,8 @@ struct fs_ops *file_system[] = {
 #ifdef LOADER_BZIP2_SUPPORT
     &bzipfs_fsops,
 #endif
-#ifdef LOADER_NFS_SUPPORT 
-    &nfs_fsops,
-#endif
-#ifdef LOADER_TFTP_SUPPORT
-    &tftp_fsops,
+#ifdef LOADER_SPLIT_SUPPORT
+    &splitfs_fsops,
 #endif
     NULL
 };

Modified: stable/10/sys/boot/pc98/loader/conf.c
==============================================================================
--- stable/10/sys/boot/pc98/loader/conf.c	Fri Jan 30 18:34:56 2015	(r277945)
+++ stable/10/sys/boot/pc98/loader/conf.c	Fri Jan 30 18:55:05 2015	(r277946)
@@ -61,19 +61,19 @@ struct fs_ops *file_system[] = {
     &ext2fs_fsops,
     &dosfs_fsops,
     &cd9660_fsops,
-    &splitfs_fsops,
-#ifdef LOADER_GZIP_SUPPORT
-    &gzipfs_fsops,
-#endif
-#ifdef LOADER_BZIP2_SUPPORT
-    &bzipfs_fsops,
-#endif
 #ifdef LOADER_NFS_SUPPORT 
     &nfs_fsops,
 #endif
 #ifdef LOADER_TFTP_SUPPORT
     &tftp_fsops,
 #endif
+#ifdef LOADER_GZIP_SUPPORT
+    &gzipfs_fsops,
+#endif
+#ifdef LOADER_BZIP2_SUPPORT
+    &bzipfs_fsops,
+#endif
+    &splitfs_fsops,
     NULL
 };