Author: jhb
Date: Fri Jan 30 18:55:16 2015
New Revision: 277947
URL: https://svnweb.freebsd.org/changeset/base/277947
Log:
MFC 274398,274537:
Move NFS and TFTP filesystems before the synthetic filesystems (bzip,
gzip, and split).
Modified:
stable/9/sys/boot/i386/loader/conf.c
stable/9/sys/boot/pc98/loader/conf.c
Directory Properties:
stable/9/sys/ (props changed)
stable/9/sys/boot/ (props changed)
Modified: stable/9/sys/boot/i386/loader/conf.c
==============================================================================
--- stable/9/sys/boot/i386/loader/conf.c Fri Jan 30 18:55:05 2015
(r277946)
+++ stable/9/sys/boot/i386/loader/conf.c Fri Jan 30 18:55:16 2015
(r277947)
@@ -77,8 +77,11 @@ struct fs_ops *file_system[] = {
&ext2fs_fsops,
&dosfs_fsops,
&cd9660_fsops,
-#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,
@@ -86,11 +89,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/9/sys/boot/pc98/loader/conf.c
==============================================================================
--- stable/9/sys/boot/pc98/loader/conf.c Fri Jan 30 18:55:05 2015
(r277946)
+++ stable/9/sys/boot/pc98/loader/conf.c Fri Jan 30 18:55:16 2015
(r277947)
@@ -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
};
_______________________________________________
svn-src-stable-9@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-stable-9
To unsubscribe, send any mail to "svn-src-stable-9-unsubscr...@freebsd.org"
