initramfs: fixes for (debian) initramfs

* contrib/initramfs: include /etc/default/zfs and /etc/zfs/zfs-functions
At least debian needs /etc/default/zfs and /etc/zfs/zfs-functions for
its initramfs. Include both in build when initramfs is configured.

* contrib/initramfs: include 60-zvol.rules and zvol_id
Include 60-zvol.rules and zvol_id and set udev as predependency instead
of debians zdev. This makes debians additional zdev hook unneeded.

* Correct initconfdir substitution for some distros
Not every Linux distro is using @sysconfdir@/default but @initconfdir@
which is already determined by configure. Let's use it.

* systemd: prevent possible conflict between systemd and sysvinit
Systemd will not load a sysvinit service if a unit exists with the same
name. This prevents conflicts between sysvinit and systemd.
In ZFS there is one sysvinit service that does not have a systemd
service but a target counterpart, zfs-import.target.
Usually it does not make any sense to install both but it is possisble.
Let's prevent any conflict by masking zfs-import.service by default.
This does not harm even if init.d/zfs-import does not exist.

Reviewed-by: Chris Wedgwood <cw@f00f.org>
Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Tested-by: Alex Ingram <reimu@reimuhakurei.net>
Tested-by: Dreamcat4 <dreamcat4@gmail.com>
Signed-off-by: Michael Niewöhner <foss@mniewoehner.de>
Closes #7904
Closes #9089

diff --git a/contrib/initramfs/Makefile.am b/contrib/initramfs/Makefile.am
index fefd676ce0f9631298ca4a86b89b02f3406812d8..52bdeb2afe54934366bb4c2dcde7f1910582bd94 100644 (file)
--- a/contrib/initramfs/Makefile.am
+++ b/contrib/initramfs/Makefile.am
@@ -6,10 +6,15 @@ initrd_SCRIPTS = \
 SUBDIRS = hooks scripts
 
 EXTRA_DIST = \
+       $(top_srcdir)/etc/init.d/zfs \
+       $(top_srcdir)/etc/init.d/zfs-functions \
        $(top_srcdir)/contrib/initramfs/conf.d/zfs \
        $(top_srcdir)/contrib/initramfs/conf-hooks.d/zfs \
        $(top_srcdir)/contrib/initramfs/README.initramfs.markdown
 
+$(top_srcdir)/etc/init.d/zfs $(top_srcdir)/etc/init.d/zfs-functions:
+       $(MAKE) -C $(top_srcdir)/etc/init.d zfs zfs-functions
+
 install-initrdSCRIPTS: $(EXTRA_DIST)
        for d in conf.d conf-hooks.d scripts/local-top; do \
                $(MKDIR_P) $(DESTDIR)$(initrddir)/$$d; \
@@ -21,8 +26,9 @@ install-initrdSCRIPTS: $(EXTRA_DIST)
                cp $(top_builddir)/contrib/initramfs/$$d/zfs \
                    $(DESTDIR)$(initrddir)/$$d/; \
        done
-       if [ -f $(top_builddir)/etc/init.d/zfs ]; then \
-               $(MKDIR_P) $(DESTDIR)$(DEFAULT_INITCONF_DIR); \
-               cp $(top_builddir)/etc/init.d/zfs \
-                   $(DESTDIR)$(DEFAULT_INITCONF_DIR)/; \
-       fi
+       $(MKDIR_P) $(DESTDIR)$(DEFAULT_INITCONF_DIR); \
+       cp $(top_builddir)/etc/init.d/zfs \
+           $(DESTDIR)$(DEFAULT_INITCONF_DIR)/; \
+       $(MKDIR_P) $(DESTDIR)$(sysconfdir)/zfs; \
+       cp $(top_builddir)/etc/init.d/zfs-functions \
+           $(DESTDIR)$(sysconfdir)/zfs/

diff --git a/contrib/initramfs/hooks/zfs.in b/contrib/initramfs/hooks/zfs.in
index e35354141d8153dc42e6a3d149c5d8c24ab0f6b1..15f23c908b23f3afc206055bad78772e9f6fc0f0 100755 (executable)
--- a/contrib/initramfs/hooks/zfs.in
+++ b/contrib/initramfs/hooks/zfs.in
@@ -4,16 +4,18 @@
 #
 
 # This hook installs udev rules for ZoL.
-PREREQ="zdev"
+PREREQ="udev"
 
 # These prerequisites are provided by the zfsutils package. The zdb utility is
 # not strictly required, but it can be useful at the initramfs recovery prompt.
 COPY_EXEC_LIST="@sbindir@/zdb @sbindir@/zpool @sbindir@/zfs"
 COPY_EXEC_LIST="$COPY_EXEC_LIST @mounthelperdir@/mount.zfs @udevdir@/vdev_id"
+COPY_EXEC_LIST="$COPY_EXEC_LIST @udevdir@/zvol_id"
 COPY_FILE_LIST="/etc/hostid @sysconfdir@/zfs/zpool.cache"
-COPY_FILE_LIST="$COPY_FILE_LIST @sysconfdir@/default/zfs"
+COPY_FILE_LIST="$COPY_FILE_LIST @DEFAULT_INITCONF_DIR@/zfs"
 COPY_FILE_LIST="$COPY_FILE_LIST @sysconfdir@/zfs/zfs-functions"
 COPY_FILE_LIST="$COPY_FILE_LIST @sysconfdir@/zfs/vdev_id.conf"
+COPY_FILE_LIST="$COPY_FILE_LIST @udevruledir@/60-zvol.rules"
 COPY_FILE_LIST="$COPY_FILE_LIST @udevruledir@/69-vdev.rules"
 
 # These prerequisites are provided by the base system.

diff --git a/etc/systemd/system/Makefile.am b/etc/systemd/system/Makefile.am
index 9249f15eb45538393b5bb2487f731dfc8d6ca691..ba73f558a8a093c2012e817bcf3a48f41f0879a1 100644 (file)
--- a/etc/systemd/system/Makefile.am
+++ b/etc/systemd/system/Makefile.am
@@ -31,5 +31,9 @@ $(systemdunit_DATA) $(systemdpreset_DATA):%:%.in
                -e 's,@sysconfdir\@,$(sysconfdir),g' \
                $< >'$@'
 
+install-data-hook:
+       $(MKDIR_P) "$(DESTDIR)$(systemdunitdir)"
+       ln -s /dev/null "$(DESTDIR)$(systemdunitdir)/zfs-import.service"
+
 distclean-local::
        -$(RM) $(systemdunit_DATA) $(systemdpreset_DATA)

diff --git a/rpm/generic/zfs.spec.in b/rpm/generic/zfs.spec.in
index a74d066bbae1eab2e6487e0662b5d4c206f2fca9..e4aef6725266bf5944d3b5133fb20b2c228a3e57 100644 (file)
--- a/rpm/generic/zfs.spec.in
+++ b/rpm/generic/zfs.spec.in
@@ -433,6 +433,14 @@ systemctl --system daemon-reload >/dev/null || true
 %{_udevdir}/vdev_id
 %{_udevdir}/zvol_id
 %{_udevdir}/rules.d/*
+%if ! 0%{?_systemd} || 0%{?_initramfs}
+# Files needed for sysvinit and initramfs-tools
+%{_sysconfdir}/%{name}/zfs-functions
+%config(noreplace) %{_initconfdir}/zfs
+%else
+%exclude %{_sysconfdir}/%{name}/zfs-functions
+%exclude %{_initconfdir}/zfs
+%endif
 %if 0%{?_systemd}
 %{_unitdir}/*
 %{_presetdir}/*
@@ -440,9 +448,10 @@ systemctl --system daemon-reload >/dev/null || true
 %{_systemdgeneratordir}/*
 %else
 %config(noreplace) %{_sysconfdir}/init.d/*
-%config(noreplace) %{_initconfdir}/zfs
 %endif
-%config(noreplace) %{_sysconfdir}/%{name}
+%config(noreplace) %{_sysconfdir}/%{name}/zed.d/*
+%config(noreplace) %{_sysconfdir}/%{name}/zpool.d/*
+%config(noreplace) %{_sysconfdir}/%{name}/vdev_id.conf.*.example
 %attr(440, root, root) %config(noreplace) %{_sysconfdir}/sudoers.d/*
 
 %files -n libzpool2