Temporary commit (just for transparence; will be squashed to prior

commit later)
Changes:
- Move dracut systemd service to dracut module as it is only used by
  dracut itself but never after rootfs got mounted.
  This seems to be the correct path for such service file, as this is done
  in multiple upstream modules, too.
- Add install to module setup
- Make dependency on zfs-env-bootfs dependent on cmdline, just like this
  is done in the [Mount] section
- Revert changes to rpm/generic/zfs.spec.in and configure.ac
- Renamed service to zfs-env-bootfs

configure.ac

@@ -127,7 +127,6 @@ AC_CONFIG_FILES([
 	contrib/dracut/Makefile
 	contrib/dracut/02zfsexpandknowledge/Makefile
 	contrib/dracut/90zfs/Makefile
-	contrib/dracut/systemd/Makefile
 	contrib/initramfs/Makefile
 	contrib/initramfs/hooks/Makefile
 	contrib/initramfs/scripts/Makefile

contrib/dracut/90zfs/.gitignore

@@ -6,3 +6,4 @@ zfs-generator.sh
 zfs-lib.sh
 zfs-load-key.sh
 zfs-needshutdown.sh
+zfs-env-bootfs.service

contrib/dracut/90zfs/Makefile.am

@@ -9,6 +9,9 @@ pkgdracut_SCRIPTS = \
 	zfs-needshutdown.sh \
 	zfs-lib.sh
 
+pkgdracut_DATA = \
+	zfs-env-bootfs.service
+
 EXTRA_DIST = \
 	$(top_srcdir)/contrib/dracut/90zfs/export-zfs.sh.in \
 	$(top_srcdir)/contrib/dracut/90zfs/module-setup.sh.in \
@@ -17,9 +20,10 @@ EXTRA_DIST = \
 	$(top_srcdir)/contrib/dracut/90zfs/zfs-generator.sh.in \
 	$(top_srcdir)/contrib/dracut/90zfs/zfs-load-key.sh.in \
 	$(top_srcdir)/contrib/dracut/90zfs/zfs-needshutdown.sh.in \
-	$(top_srcdir)/contrib/dracut/90zfs/zfs-lib.sh.in
+	$(top_srcdir)/contrib/dracut/90zfs/zfs-lib.sh.in \
+	$(top_srcdir)/contrib/dracut/90zfs/zfs-env-bootfs.service.in
 
-$(pkgdracut_SCRIPTS):%:%.in
+$(pkgdracut_SCRIPTS) $(pkgdracut_DATA) :%:%.in
 	-$(SED) -e 's,@bindir\@,$(bindir),g' \
 		-e 's,@sbindir\@,$(sbindir),g' \
 		-e 's,@udevdir\@,$(udevdir),g' \
@@ -30,4 +34,4 @@ $(pkgdracut_SCRIPTS):%:%.in
 		$< >'$@'
 
 distclean-local::
-	-$(RM) $(pkgdracut_SCRIPTS)
+	-$(RM) $(pkgdracut_SCRIPTS) $(pkgdracut_DATA)

contrib/dracut/90zfs/module-setup.sh.in

@@ -98,6 +98,7 @@ install() {
 				type mark_hostonly >/dev/null 2>&1 && mark_hostonly @systemdunitdir@/zfs-import-$_item.service
 			fi
 		done
+		inst "${moddir}/zfs-env-bootfs.service" "${systemdsystemunitdir}/zfs-env-bootfs.service"
 		dracut_install systemd-ask-password
 		dracut_install systemd-tty-ask-password-agent
 		mkdir -p "${initdir}/$systemdsystemunitdir/initrd.target.wants"

contrib/dracut/90zfs/zfs-generator.sh.in

@@ -41,8 +41,11 @@ echo "zfs-generator: writing extension for sysroot.mount to $GENERATOR_DIR"/sysr
 {
     echo "[Unit]"
     echo "Before=initrd-root-fs.target"
-    echo "After=zfs-dracut-bootfs.service zfs-import.target"
-    echo "Requires=zfs-dracut-bootfs.service"
+    echo "After=zfs-import.target"
+    if [ "${root}" = "zfs:AUTO" ] ; then
+      echo "After=zfs-env-bootfs.service"
+      echo "Requires=zfs-env-bootfs.service"
+    fi
     echo "[Mount]"
     if [ "${root}" = "zfs:AUTO" ] ; then
       echo "PassEnvironment=BOOTFS"

contrib/dracut/Makefile.am

@@ -1,4 +1,3 @@
-SUBDIRS = 02zfsexpandknowledge 90zfs $(ZFS_INIT_SYSTEMD)
-DIST_SUBDIRS = 02zfsexpandknowledge 90zfs systemd
+SUBDIRS = 02zfsexpandknowledge 90zfs
 
 EXTRA_DIST = README.dracut.markdown

rpm/generic/zfs.spec.in

@@ -320,7 +320,7 @@ image which is ZFS aware.
 
 %if 0%{?_systemd}
     %define systemd --enable-systemd --with-systemdunitdir=%{_unitdir} --with-systemdpresetdir=%{_presetdir} --with-systemdmodulesloaddir=%{_modulesloaddir} --with-systemdgeneratordir=%{_systemdgeneratordir} --disable-sysvinit
-    %define systemd_svcs zfs-import-cache.service zfs-import-scan.service zfs-mount.service zfs-share.service zfs-zed.service zfs.target zfs-import.target zfs-dracut-bootfs.service
+    %define systemd_svcs zfs-import-cache.service zfs-import-scan.service zfs-mount.service zfs-share.service zfs-zed.service zfs.target zfs-import.target
 %else
     %define systemd --enable-sysvinit --disable-systemd
 %endif
@@ -435,7 +435,6 @@ systemctl --system daemon-reload >/dev/null || true
 %{_presetdir}/*
 %{_modulesloaddir}/*
 %{_systemdgeneratordir}/*
-%exclude %{_unitdir}/zfs-dracut*
 %else
 %config(noreplace) %{_sysconfdir}/init.d/*
 %config(noreplace) %{_initconfdir}/zfs
@@ -468,9 +467,6 @@ systemctl --system daemon-reload >/dev/null || true
 %files dracut
 %doc contrib/dracut/README.dracut.markdown
 %{_dracutdir}/modules.d/*
-%if 0%{?_systemd}
-%{_unitdir}/zfs-dracut*
-%endif
 
 %if %{with pyzfs}
 %files -n python%{__python_pkg_version}-pyzfs