aboutsummaryrefslogtreecommitdiff
path: root/sys/fs/nullfs
diff options
context:
space:
mode:
authorEdward Tomasz Napierala <trasz@FreeBSD.org>2020-10-29 15:28:15 +0000
committerEdward Tomasz Napierala <trasz@FreeBSD.org>2020-10-29 15:28:15 +0000
commite3c51151a09a22dd416caf74f70bda961088832d (patch)
tree76f0f04e2a8dc16cb549dc915566ddecf449d5ab /sys/fs/nullfs
parenta249b285b717ac6116d4d599fda92ce186509e46 (diff)
downloadsrc-e3c51151a09a22dd416caf74f70bda961088832d.tar.gz
src-e3c51151a09a22dd416caf74f70bda961088832d.zip
Make it possible to mount nullfs(5) using plain mount(8)
instead of mount_nullfs(8). Obviously you'd need to force mount(8) to not call mount_nullfs(8) to make use of it. Reviewed by: kib MFC after: 2 weeks Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D26934
Notes
Notes: svn path=/head/; revision=367137
Diffstat (limited to 'sys/fs/nullfs')
-rw-r--r--sys/fs/nullfs/null_vfsops.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/sys/fs/nullfs/null_vfsops.c b/sys/fs/nullfs/null_vfsops.c
index a3d23d350188..0bb98072edf4 100644
--- a/sys/fs/nullfs/null_vfsops.c
+++ b/sys/fs/nullfs/null_vfsops.c
@@ -104,7 +104,9 @@ nullfs_mount(struct mount *mp)
/*
* Get argument
*/
- error = vfs_getopt(mp->mnt_optnew, "target", (void **)&target, &len);
+ error = vfs_getopt(mp->mnt_optnew, "from", (void **)&target, &len);
+ if (error != 0)
+ error = vfs_getopt(mp->mnt_optnew, "target", (void **)&target, &len);
if (error || target[len - 1] != '\0')
return (EINVAL);