14 files changed, 93 insertions, 179 deletions
diff --git a/sys/contrib/openzfs/etc/Makefile.am b/sys/contrib/openzfs/etc/Makefile.am
index 179c2400978c..ffe5fad2b4a9 100644
--- a/sys/contrib/openzfs/etc/Makefile.am
+++ b/sys/contrib/openzfs/etc/Makefile.am
@@ -1,9 +1,95 @@
-include $(top_srcdir)/config/Shellcheck.am
+sudoersddir = $(sysconfdir)/sudoers.d
+sudoersd_DATA = \
+	%D%/sudoers.d/zfs
+
+EXTRA_DIST += $(sudoersd_DATA)
+
+
+sysconf_zfsdir = $(sysconfdir)/zfs
+
+dist_sysconf_zfs_DATA = \
+	%D%/zfs/vdev_id.conf.alias.example \
+	%D%/zfs/vdev_id.conf.multipath.example \
+	%D%/zfs/vdev_id.conf.sas_direct.example \
+	%D%/zfs/vdev_id.conf.sas_switch.example \
+	%D%/zfs/vdev_id.conf.scsi.example
+
+sysconf_zfs_SCRIPTS = \
+	%D%/zfs/zfs-functions
+
+SUBSTFILES          += $(sysconf_zfs_SCRIPTS)
+SHELLCHECKSCRIPTS   += $(sysconf_zfs_SCRIPTS)
+$(call SHELLCHECK_OPTS,$(sysconf_zfs_SCRIPTS)): SHELLCHECK_SHELL = sh
 
-SUBDIRS = zfs sudoers.d
-SHELLCHECKDIRS = default $(ZFS_INIT_SYSV) zfs
 
 if BUILD_LINUX
-SUBDIRS += default $(ZFS_INIT_SYSTEMD) $(ZFS_INIT_SYSV) $(ZFS_MODULE_LOAD)
+initconf_SCRIPTS = \
+	%D%/default/zfs
+
+SUBSTFILES          += $(initconf_SCRIPTS)
+SHELLCHECKSCRIPTS   += $(initconf_SCRIPTS)
+$(call SHELLCHECK_OPTS,$(initconf_SCRIPTS)): SHELLCHECK_SHELL = sh
+
+
+if INIT_SYSV
+EXTRA_DIST += $(addprefix %D%/,init.d/README.md)
+
+init_SCRIPTS = \
+	%D%/init.d/zfs-import \
+	%D%/init.d/zfs-load-key \
+	%D%/init.d/zfs-mount \
+	%D%/init.d/zfs-share \
+	%D%/init.d/zfs-zed
+
+SUBSTFILES        += $(init_SCRIPTS)
+SHELLCHECKSCRIPTS += $(init_SCRIPTS)
+$(call SHELLCHECK_OPTS,$(init_SCRIPTS)): SHELLCHECK_SHELL = sh
+endif
+
+
+if INIT_SYSTEMD
+dist_systemdpreset_DATA = \
+	%D%/systemd/system/50-zfs.preset
+
+systemdunit_DATA = \
+	%D%/systemd/system/zfs-import-cache.service \
+	%D%/systemd/system/zfs-import-scan.service \
+	%D%/systemd/system/zfs-import.target \
+	%D%/systemd/system/zfs-mount.service \
+	%D%/systemd/system/zfs-scrub-monthly@.timer \
+	%D%/systemd/system/zfs-scrub-weekly@.timer \
+	%D%/systemd/system/zfs-scrub@.service \
+	%D%/systemd/system/zfs-share.service \
+	%D%/systemd/system/zfs-volume-wait.service \
+	%D%/systemd/system/zfs-volumes.target \
+	%D%/systemd/system/zfs-zed.service \
+	%D%/systemd/system/zfs.target
+
+SUBSTFILES += $(systemdunit_DATA)
+
+INSTALL_DATA_HOOKS += systemd-install-data-hook
+systemd-install-data-hook:
+	$(MKDIR_P) "$(DESTDIR)$(systemdunitdir)"
+	ln -sf /dev/null "$(DESTDIR)$(systemdunitdir)/zfs-import.service"
+
+
+systemdgenerator_PROGRAMS = \
+	%D%/systemd/system-generators/zfs-mount-generator
+
+%C%_systemd_system_generators_zfs_mount_generator_SOURCES = \
+	%D%/systemd/system-generators/zfs-mount-generator.c
+
+%C%_systemd_system_generators_zfs_mount_generator_LDADD = \
+	libzfs.la
+
+%C%_systemd_system_generators_zfs_mount_generator_LDFLAGS = -pthread
+
+CPPCHECKTARGETS += $(systemdgenerator_PROGRAMS)
+endif
+
+
+if WANT_MODULES_LOAD_D
+dist_modulesload_DATA = \
+	%D%/modules-load.d/zfs.conf
+endif
 endif
-DIST_SUBDIRS = default init.d zfs systemd modules-load.d sudoers.d
diff --git a/sys/contrib/openzfs/etc/default/Makefile.am b/sys/contrib/openzfs/etc/default/Makefile.am
deleted file mode 100644
index 0f7c96698d45..000000000000
--- a/sys/contrib/openzfs/etc/default/Makefile.am
+++ /dev/null
@@ -1,8 +0,0 @@
-include $(top_srcdir)/config/Substfiles.am
-include $(top_srcdir)/config/Shellcheck.am
-
-initconf_SCRIPTS = zfs
-
-SUBSTFILES += $(initconf_SCRIPTS)
-
-SHELLCHECK_SHELL = sh
diff --git a/sys/contrib/openzfs/etc/init.d/Makefile.am b/sys/contrib/openzfs/etc/init.d/Makefile.am
deleted file mode 100644
index 625d0b91fd11..000000000000
--- a/sys/contrib/openzfs/etc/init.d/Makefile.am
+++ /dev/null
@@ -1,10 +0,0 @@
-include $(top_srcdir)/config/Substfiles.am
-include $(top_srcdir)/config/Shellcheck.am
-
-EXTRA_DIST += README.md
-
-init_SCRIPTS = zfs-import zfs-load-key zfs-mount zfs-share zfs-zed
-
-SUBSTFILES += $(init_SCRIPTS)
-
-SHELLCHECK_SHELL = sh
diff --git a/sys/contrib/openzfs/etc/init.d/zfs-mount.in b/sys/contrib/openzfs/etc/init.d/zfs-mount.in
index d196d1555a45..df28c6c951c5 100755
--- a/sys/contrib/openzfs/etc/init.d/zfs-mount.in
+++ b/sys/contrib/openzfs/etc/init.d/zfs-mount.in
@@ -63,7 +63,7 @@ do_depend()
 # Mount all datasets/filesystems
 do_mount()
 {
-	local verbose overlay i mntpt
+	local verbose overlay
 
 	check_boolean "$VERBOSE_MOUNT" && verbose=v
 	check_boolean "$DO_OVERLAY_MOUNTS" && overlay=O
@@ -71,102 +71,18 @@ do_mount()
 	zfs_action "Mounting ZFS filesystem(s)" \
 	    "$ZFS" mount "-a$verbose$overlay" "$MOUNT_EXTRA_OPTIONS"
 
-	# Require each volume/filesystem to have 'noauto' and no fsck
-	# option. This shouldn't really be necessary, as long as one
-	# can get zfs-import to run sufficiently early on in the boot
-	# process - before local mounts. This is just here in case/if
-	# this isn't possible.
-	check_boolean "$VERBOSE_MOUNT" && \
-	    zfs_log_begin_msg "Mounting volumes and filesystems registered in fstab"
-
-	read_mtab  "^/dev/(zd|zvol)"
-	read_fstab "^/dev/(zd|zvol)"
-	i=0; var="FSTAB_0"
-	while [ -n "$(eval echo "\$$var")" ]
-	do
-		mntpt=$(eval echo "\$$var")
-		dev=$(eval echo "\$FSTAB_dev_$i")
-		if ! in_mtab "$mntpt" && ! is_mounted "$mntpt" && [ -e "$dev" ]
-		then
-			check_boolean "$VERBOSE_MOUNT" && \
-				zfs_log_progress_msg "$mntpt "
-			fsck "$dev" && mount "$mntpt"
-		fi
-
-		i=$((i + 1))
-		var=$(eval echo "FSTAB_$i")
-	done
-
-	read_mtab  "[[:space:]]zfs[[:space:]]"
-	read_fstab "[[:space:]]zfs[[:space:]]"
-	i=0; var=$(eval echo "FSTAB_$i")
-	while [ -n "$(eval echo "\$$var")" ]
-	do
-		mntpt=$(eval echo "\$$var")
-		if ! in_mtab "$mntpt" && ! is_mounted "$mntpt"
-		then
-			check_boolean "$VERBOSE_MOUNT" && \
-				zfs_log_progress_msg "$mntpt "
-			mount "$mntpt"
-		fi
-
-		i=$((i + 1))
-		var=$(eval echo "FSTAB_$i")
-	done
-	check_boolean "$VERBOSE_MOUNT" && zfs_log_end_msg 0
-
 	return 0
 }
 
 # Unmount all filesystems
 do_unmount()
 {
-	local i var mntpt
-
 	# This shouldn't really be necessary, as long as one can get
 	# zfs-import to run sufficiently late in the shutdown/reboot process
 	# - after unmounting local filesystems. This is just here in case/if
 	# this isn't possible.
 	zfs_action "Unmounting ZFS filesystems" "$ZFS" unmount -a
 
-	check_boolean "$VERBOSE_MOUNT" && \
-	    zfs_log_begin_msg "Unmounting volumes and filesystems registered in fstab"
-
-	read_mtab  "^/dev/(zd|zvol)"
-	read_fstab "^/dev/(zd|zvol)"
-	i=0; var="FSTAB_0"
-	while [ -n "$(eval echo "\$$var")" ]
-	do
-		mntpt=$(eval echo "\$$var")
-		dev=$(eval echo "\$FSTAB_dev_$i")
-		if in_mtab "$mntpt"
-		then
-			check_boolean "$VERBOSE_MOUNT" && \
-				zfs_log_progress_msg "$mntpt "
-			umount "$mntpt"
-		fi
-
-		i=$((i + 1))
-		var=$(eval echo "FSTAB_$i")
-	done
-
-	read_mtab  "[[:space:]]zfs[[:space:]]"
-	read_fstab "[[:space:]]zfs[[:space:]]"
-	i=0; var="FSTAB_0"
-	while [ -n "$(eval echo "\$$var")" ]
-	do
-		mntpt=$(eval echo "\$$var")
-		if in_mtab "$mntpt"; then
-			check_boolean "$VERBOSE_MOUNT" && \
-			    zfs_log_progress_msg "$mntpt "
-			umount "$mntpt"
-		fi
-
-		i=$((i + 1))
-		var=$(eval echo "FSTAB_$i")
-	done
-	check_boolean "$VERBOSE_MOUNT" && zfs_log_end_msg 0
-
 	return 0
 }
 
diff --git a/sys/contrib/openzfs/etc/init.d/zfs-zed.in b/sys/contrib/openzfs/etc/init.d/zfs-zed.in
index 47f742259b27..e9cf8867403c 100755
--- a/sys/contrib/openzfs/etc/init.d/zfs-zed.in
+++ b/sys/contrib/openzfs/etc/init.d/zfs-zed.in
@@ -69,8 +69,7 @@ do_stop()
 	then
 		# No pools imported, it is/should be safe/possible to
 		# unload modules.
-		zfs_action "Unloading modules" rmmod zfs zunicode \
-		    zavl zcommon znvpair zlua spl
+		zfs_action "Unloading modules" rmmod zfs spl
 		return "$?"
 	fi
 }
diff --git a/sys/contrib/openzfs/etc/modules-load.d/.gitignore b/sys/contrib/openzfs/etc/modules-load.d/.gitignore
deleted file mode 100644
index fee921708337..000000000000
--- a/sys/contrib/openzfs/etc/modules-load.d/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-*.conf
diff --git a/sys/contrib/openzfs/etc/modules-load.d/Makefile.am b/sys/contrib/openzfs/etc/modules-load.d/Makefile.am
deleted file mode 100644
index 8a2955767b1e..000000000000
--- a/sys/contrib/openzfs/etc/modules-load.d/Makefile.am
+++ /dev/null
@@ -1,2 +0,0 @@
-dist_modulesload_DATA = \
-	zfs.conf
diff --git a/sys/contrib/openzfs/etc/sudoers.d/Makefile.am b/sys/contrib/openzfs/etc/sudoers.d/Makefile.am
deleted file mode 100644
index 6f7ac8dbfd61..000000000000
--- a/sys/contrib/openzfs/etc/sudoers.d/Makefile.am
+++ /dev/null
@@ -1,5 +0,0 @@
-sudoersddir = $(sysconfdir)/sudoers.d
-sudoersd_DATA = zfs
-
-EXTRA_DIST = \
-	zfs
diff --git a/sys/contrib/openzfs/etc/systemd/Makefile.am b/sys/contrib/openzfs/etc/systemd/Makefile.am
deleted file mode 100644
index 66232a5ff197..000000000000
--- a/sys/contrib/openzfs/etc/systemd/Makefile.am
+++ /dev/null
@@ -1,4 +0,0 @@
-include $(top_srcdir)/config/Shellcheck.am
-
-SUBDIRS = system system-generators
-SHELLCHECKDIRS = system-generators
diff --git a/sys/contrib/openzfs/etc/systemd/system-generators/Makefile.am b/sys/contrib/openzfs/etc/systemd/system-generators/Makefile.am
deleted file mode 100644
index e5920bf39203..000000000000
--- a/sys/contrib/openzfs/etc/systemd/system-generators/Makefile.am
+++ /dev/null
@@ -1,14 +0,0 @@
-include $(top_srcdir)/config/Rules.am
-
-systemdgenerator_PROGRAMS = \
-	zfs-mount-generator
-
-zfs_mount_generator_SOURCES = \
-	zfs-mount-generator.c
-
-zfs_mount_generator_LDADD = \
-	$(abs_top_builddir)/lib/libzfs/libzfs.la
-
-zfs_mount_generator_LDFLAGS = -pthread
-
-include $(top_srcdir)/config/CppCheck.am
diff --git a/sys/contrib/openzfs/etc/systemd/system/.gitignore b/sys/contrib/openzfs/etc/systemd/system/.gitignore
index 4813c65a25a8..95d33fdd436d 100644
--- a/sys/contrib/openzfs/etc/systemd/system/.gitignore
+++ b/sys/contrib/openzfs/etc/systemd/system/.gitignore
@@ -1,4 +1,3 @@
 *.service
 *.target
-*.preset
 *.timer
diff --git a/sys/contrib/openzfs/etc/systemd/system/50-zfs.preset.in b/sys/contrib/openzfs/etc/systemd/system/50-zfs.preset
index e4056a92cd98..e4056a92cd98 100644
--- a/sys/contrib/openzfs/etc/systemd/system/50-zfs.preset.in
+++ b/sys/contrib/openzfs/etc/systemd/system/50-zfs.preset
diff --git a/sys/contrib/openzfs/etc/systemd/system/Makefile.am b/sys/contrib/openzfs/etc/systemd/system/Makefile.am
deleted file mode 100644
index 5e65e1db420c..000000000000
--- a/sys/contrib/openzfs/etc/systemd/system/Makefile.am
+++ /dev/null
@@ -1,24 +0,0 @@
-include $(top_srcdir)/config/Substfiles.am
-
-systemdpreset_DATA = \
-	50-zfs.preset
-
-systemdunit_DATA = \
-	zfs-zed.service \
-	zfs-import-cache.service \
-	zfs-import-scan.service \
-	zfs-mount.service \
-	zfs-share.service \
-	zfs-volume-wait.service \
-	zfs-import.target \
-	zfs-volumes.target \
-	zfs.target \
-	zfs-scrub-monthly@.timer \
-	zfs-scrub-weekly@.timer \
-	zfs-scrub@.service
-
-SUBSTFILES += $(systemdpreset_DATA) $(systemdunit_DATA)
-
-install-data-hook:
-	$(MKDIR_P) "$(DESTDIR)$(systemdunitdir)"
-	ln -sf /dev/null "$(DESTDIR)$(systemdunitdir)/zfs-import.service"
diff --git a/sys/contrib/openzfs/etc/zfs/Makefile.am b/sys/contrib/openzfs/etc/zfs/Makefile.am
deleted file mode 100644
index 8a67d548bf7e..000000000000
--- a/sys/contrib/openzfs/etc/zfs/Makefile.am
+++ /dev/null
@@ -1,18 +0,0 @@
-include $(top_srcdir)/config/Substfiles.am
-include $(top_srcdir)/config/Shellcheck.am
-
-pkgsysconfdir = $(sysconfdir)/zfs
-
-dist_pkgsysconf_DATA = \
-	vdev_id.conf.alias.example \
-	vdev_id.conf.sas_direct.example \
-	vdev_id.conf.sas_switch.example \
-	vdev_id.conf.multipath.example \
-	vdev_id.conf.scsi.example
-
-pkgsysconf_SCRIPTS = \
-	zfs-functions
-
-SUBSTFILES += $(pkgsysconf_SCRIPTS)
-
-SHELLCHECK_SHELL = sh