diff options
| -rw-r--r-- | sbin/mount_null/mount_null.c | 10 | ||||
| -rw-r--r-- | sbin/mount_nullfs/mount_nullfs.c | 10 | ||||
| -rw-r--r-- | sys/boot/forth/loader.conf | 2 | ||||
| -rw-r--r-- | sys/fs/nullfs/null_vfsops.c | 2 | ||||
| -rw-r--r-- | sys/miscfs/nullfs/null_vfsops.c | 2 | ||||
| -rw-r--r-- | sys/modules/nullfs/Makefile | 2 |
6 files changed, 14 insertions, 14 deletions
diff --git a/sbin/mount_null/mount_null.c b/sbin/mount_null/mount_null.c index cf61208..d38e7e3 100644 --- a/sbin/mount_null/mount_null.c +++ b/sbin/mount_null/mount_null.c @@ -107,12 +107,12 @@ main(argc, argv) args.target = target; - error = getvfsbyname("null", &vfc); - if (error && vfsisloadable("null")) { - if(vfsload("null")) - err(EX_OSERR, "vfsload(null)"); + error = getvfsbyname("nullfs", &vfc); + if (error && vfsisloadable("nullfs")) { + if(vfsload("nullfs")) + err(EX_OSERR, "vfsload(nullfs)"); endvfsent(); - error = getvfsbyname("null", &vfc); + error = getvfsbyname("nullfs", &vfc); } if (error) errx(EX_OSERR, "null/loopback filesystem is not available"); diff --git a/sbin/mount_nullfs/mount_nullfs.c b/sbin/mount_nullfs/mount_nullfs.c index cf61208..d38e7e3 100644 --- a/sbin/mount_nullfs/mount_nullfs.c +++ b/sbin/mount_nullfs/mount_nullfs.c @@ -107,12 +107,12 @@ main(argc, argv) args.target = target; - error = getvfsbyname("null", &vfc); - if (error && vfsisloadable("null")) { - if(vfsload("null")) - err(EX_OSERR, "vfsload(null)"); + error = getvfsbyname("nullfs", &vfc); + if (error && vfsisloadable("nullfs")) { + if(vfsload("nullfs")) + err(EX_OSERR, "vfsload(nullfs)"); endvfsent(); - error = getvfsbyname("null", &vfc); + error = getvfsbyname("nullfs", &vfc); } if (error) errx(EX_OSERR, "null/loopback filesystem is not available"); diff --git a/sys/boot/forth/loader.conf b/sys/boot/forth/loader.conf index 60abf27..272f37e 100644 --- a/sys/boot/forth/loader.conf +++ b/sys/boot/forth/loader.conf @@ -90,7 +90,7 @@ mfs_load="NO" # Memory filesystem msdos_load="NO" # FAT-12/16/32 nfs_load="NO" # NFS ntfs_load="NO" # NTFS -null_load="NO" # Null filesystem +nullfs_load="NO" # Null filesystem portal_load="NO" # Portal filesystem procfs_load="NO" # Process filesystem umap_load="NO" # User-id map filesystem diff --git a/sys/fs/nullfs/null_vfsops.c b/sys/fs/nullfs/null_vfsops.c index a793bc7..43e0e84 100644 --- a/sys/fs/nullfs/null_vfsops.c +++ b/sys/fs/nullfs/null_vfsops.c @@ -446,4 +446,4 @@ static struct vfsops null_vfsops = { nullfs_extattrctl, }; -VFS_SET(null_vfsops, null, VFCF_LOOPBACK); +VFS_SET(null_vfsops, nullfs, VFCF_LOOPBACK); diff --git a/sys/miscfs/nullfs/null_vfsops.c b/sys/miscfs/nullfs/null_vfsops.c index a793bc7..43e0e84 100644 --- a/sys/miscfs/nullfs/null_vfsops.c +++ b/sys/miscfs/nullfs/null_vfsops.c @@ -446,4 +446,4 @@ static struct vfsops null_vfsops = { nullfs_extattrctl, }; -VFS_SET(null_vfsops, null, VFCF_LOOPBACK); +VFS_SET(null_vfsops, nullfs, VFCF_LOOPBACK); diff --git a/sys/modules/nullfs/Makefile b/sys/modules/nullfs/Makefile index e895b4b..5786066 100644 --- a/sys/modules/nullfs/Makefile +++ b/sys/modules/nullfs/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ .PATH: ${.CURDIR}/../../miscfs/nullfs -KMOD= null +KMOD= nullfs SRCS= vnode_if.h \ null_subr.c null_vfsops.c null_vnops.c NOMAN= |
