d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Change mount_fs() to not exit on error. The "failok" mount option

Browse Source 
requires that errors are passed to the caller.

PR:		163668
Reviewed by:	Garrett Cooper
This commit is contained in:
Jaakko Heinonen 2012-01-20 10:06:28 +00:00
parent b8f532c5b7
commit 84d5bd0560
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
sbin/mount/mount_fs.c
View File

@ -82,7 +82,6 @@ mount_fs(const char *vfstype, int argc, char *argv[])
char fstype[32];
char errmsg[255];
char *p, *val;
int ret;
strlcpy(fstype, vfstype, sizeof(fstype));
memset(errmsg, 0, sizeof(errmsg));
@ -128,10 +127,10 @@ mount_fs(const char *vfstype, int argc, char *argv[])
build_iovec(&iov, &iovlen, "fspath", mntpath, (size_t)-1);
build_iovec(&iov, &iovlen, "from", dev, (size_t)-1);
build_iovec(&iov, &iovlen, "errmsg", errmsg, sizeof(errmsg));
ret = nmount(iov, iovlen, mntflags);
if (ret < 0)
err(1, "%s %s", dev, errmsg);
return (ret);
if (nmount(iov, iovlen, mntflags) == -1) {
warn("%s: %s", dev, errmsg);
return (1);
}
return (0);
}