Undo the damage I did in sys/kern/vfs_mount.c #1.274 and
sbin/mount_nfs/mount_nfs.c #1.76. Let the dragons sleep. Requested by: rodrigc, des PR: kern/120319 (welcome the bug back)
This commit is contained in:
parent
c879f6ecd7
commit
c6446de05d
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=176394
@ -516,15 +516,6 @@ main(int argc, char *argv[])
|
||||
/* resolve the mountpoint with realpath(3) */
|
||||
(void)checkpath(name, mntpath);
|
||||
|
||||
/*
|
||||
* XXX This should go away when this NFS implementation
|
||||
* is fully converted to nmount(2) semantics.
|
||||
*/
|
||||
if (mntflags & MNT_RDONLY)
|
||||
build_iovec(&iov, &iovlen, "ro", NULL, 0);
|
||||
else if (mntflags & MNT_UPDATE)
|
||||
build_iovec(&iov, &iovlen, "noro", NULL, 0);
|
||||
|
||||
build_iovec(&iov, &iovlen, "nfs_args", nfsargsp, sizeof(*nfsargsp));
|
||||
build_iovec(&iov, &iovlen, "fstype", fstype, (size_t)-1);
|
||||
build_iovec(&iov, &iovlen, "fspath", mntpath, (size_t)-1);
|
||||
|
@ -1730,11 +1730,10 @@ vfs_mountroot_try(const char *mountfrom)
|
||||
strcpy(path, ROOTNAME);
|
||||
|
||||
error = kernel_vmount(
|
||||
MNT_ROOTFS,
|
||||
MNT_RDONLY | MNT_ROOTFS,
|
||||
"fstype", vfsname,
|
||||
"fspath", "/",
|
||||
"from", path,
|
||||
"ro", NULL,
|
||||
NULL);
|
||||
if (error == 0) {
|
||||
/*
|
||||
|
Loading…
Reference in New Issue
Block a user