svn commit: r231591 - stable/9/sbin/mount

[Jaakko Heinonen]

Author: jh
Date: Mon Feb 13 18:26:58 2012
New Revision: 231591
URL: http://svn.freebsd.org/changeset/base/231591

Log:
  MFC r230373:
  
  Change mount_fs() to not exit on error. The "failok" mount option
  requires that errors are passed to the caller.
  
  PR:		163668

Modified:
  stable/9/sbin/mount/mount_fs.c
Directory Properties:
  stable/9/sbin/mount/   (props changed)

Modified: stable/9/sbin/mount/mount_fs.c
==============================================================================
--- stable/9/sbin/mount/mount_fs.c	Mon Feb 13 18:10:13 2012	(r231590)
+++ stable/9/sbin/mount/mount_fs.c	Mon Feb 13 18:26:58 2012	(r231591)
@@ -82,7 +82,6 @@ mount_fs(const char *vfstype, int argc, 
 	char fstype[32];
 	char errmsg[255];
 	char *p, *val;
-	int ret;
 
 	strlcpy(fstype, vfstype, sizeof(fstype));
 	memset(errmsg, 0, sizeof(errmsg));
@@ -125,10 +124,10 @@ mount_fs(const char *vfstype, int argc, 
 	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);
 }