diff options
| author | Jaakko Heinonen <jh@FreeBSD.org> | 2012-01-16 19:34:21 +0000 |
|---|---|---|
| committer | Jaakko Heinonen <jh@FreeBSD.org> | 2012-01-16 19:34:21 +0000 |
| commit | d3250014386b2eae2bf27edcde24d97f7bbfcfc5 (patch) | |
| tree | 54d0a2f2ed01c217587bf7b24aec11a7fbcadd97 /sbin/mount_nfs/mount_nfs.c | |
| parent | 03c142e76290016711675793c65fe924a3d1b779 (diff) | |
| download | src-d3250014386b2eae2bf27edcde24d97f7bbfcfc5.tar.gz src-d3250014386b2eae2bf27edcde24d97f7bbfcfc5.zip | |
Change checkpath() to not exit on error. This is a prerequisite for
fixing the mount(8) "failok" option.
PR: 163668
Reviewed by: Garrett Cooper, delphij (previous version)
Notes
Notes:
svn path=/head/; revision=230226
Diffstat (limited to 'sbin/mount_nfs/mount_nfs.c')
| -rw-r--r-- | sbin/mount_nfs/mount_nfs.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sbin/mount_nfs/mount_nfs.c b/sbin/mount_nfs/mount_nfs.c index c6235e08f279..d71e952ab60f 100644 --- a/sbin/mount_nfs/mount_nfs.c +++ b/sbin/mount_nfs/mount_nfs.c @@ -411,7 +411,8 @@ main(int argc, char *argv[]) exit(1); /* resolve the mountpoint with realpath(3) */ - (void)checkpath(name, mntpath); + if (checkpath(name, mntpath) != 0) + err(1, "%s", mntpath); build_iovec(&iov, &iovlen, "fstype", fstype, (size_t)-1); build_iovec(&iov, &iovlen, "fspath", mntpath, (size_t)-1); |