View | Details | Raw Unified | Return to bug 120784 | Differences between
and this patch

Collapse All | Expand All

(-)sbin/mount/mount.c (-1 / +6 lines)
Lines 560-566 Link Here
560
	if (use_mountprog(vfstype)) {
560
	if (use_mountprog(vfstype)) {
561
		ret = exec_mountprog(name, execname, argv);
561
		ret = exec_mountprog(name, execname, argv);
562
	} else {
562
	} else {
563
		ret = mount_fs(vfstype, argc, argv); 
563
		ret = mount_fs(vfstype, argc, argv);
564
		if (ret < 0) {
565
			if (verbose)
566
				warn("falling back to old style mount");
567
			ret = exec_mountprog(name, execname, argv);
568
		}
564
	}
569
	}
565
570
566
	free(optbuf);
571
	free(optbuf);
(-)sbin/mount/mount_fs.c (-2 lines)
Lines 131-138 Link Here
131
	build_iovec(&iov, &iovlen, "errmsg", errmsg, sizeof(errmsg));
131
	build_iovec(&iov, &iovlen, "errmsg", errmsg, sizeof(errmsg));
132
	
132
	
133
	ret = nmount(iov, iovlen, mntflags);
133
	ret = nmount(iov, iovlen, mntflags);
134
	if (ret < 0)
135
		err(1, "%s %s", dev, errmsg);
136
134
137
	return (ret);
135
	return (ret);
138
}
136
}

Return to bug 120784