diff options
| author | jhb <jhb@FreeBSD.org> | 2015-01-30 18:55:05 +0000 |
|---|---|---|
| committer | jhb <jhb@FreeBSD.org> | 2015-01-30 18:55:05 +0000 |
| commit | 11512d9430ef0d6ffd4996c18aa37368253f4934 (patch) | |
| tree | fd83436b4a8f0decb3f2c7f7b95195e172b294ae | |
| parent | 5cc53d04db692bfe45a7994a3e3bcf36573d9961 (diff) | |
| download | FreeBSD-src-11512d9430ef0d6ffd4996c18aa37368253f4934.zip FreeBSD-src-11512d9430ef0d6ffd4996c18aa37368253f4934.tar.gz | |
MFC 274398,274537:
Move NFS and TFTP filesystems before the synthetic filesystems (bzip,
gzip, and split).
| -rw-r--r-- | sys/boot/i386/loader/conf.c | 14 | ||||
| -rw-r--r-- | sys/boot/pc98/loader/conf.c | 14 |
2 files changed, 14 insertions, 14 deletions
diff --git a/sys/boot/i386/loader/conf.c b/sys/boot/i386/loader/conf.c index ac19751..fda6fd2 100644 --- a/sys/boot/i386/loader/conf.c +++ b/sys/boot/i386/loader/conf.c @@ -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 }; diff --git a/sys/boot/pc98/loader/conf.c b/sys/boot/pc98/loader/conf.c index ce80cef..d05cd13 100644 --- a/sys/boot/pc98/loader/conf.c +++ b/sys/boot/pc98/loader/conf.c @@ -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 }; |
