D57657.diff
No OneTemporary
Actions

Size

751 B

Referenced Files

None

Subscribers

None

D57657.diff
View Options

	diff --git a/sys/contrib/openzfs/lib/libzfs/os/freebsd/libzfs_compat.c b/sys/contrib/openzfs/lib/libzfs/os/freebsd/libzfs_compat.c
	--- a/sys/contrib/openzfs/lib/libzfs/os/freebsd/libzfs_compat.c
	+++ b/sys/contrib/openzfs/lib/libzfs/os/freebsd/libzfs_compat.c
	@@ -232,9 +232,14 @@
	* in-base module.
	*/
	if (modfind("zfs") < 0) {
	- /* Not present in kernel, try loading it. */
	- if (kldload(ZFS_KMOD) < 0 && errno != EEXIST) {
	- return (errno);
	+ load_str = getenv("ZFS_AUTOLOAD_MODULE");
	+ if (load_str && (!strncasecmp(load_str, "YES", strlen("YES"))) {
	+ /* Not present in kernel, try loading it. */
	+ if (kldload(ZFS_KMOD) < 0 && errno != EEXIST) {
	+ return (errno);
	+ }
	+ } else {
	+ return (ENXIO);
	}
	}
	return (0);