Skip to content

Instantly share code, notes, and snippets.

Embed
What would you like to do?
diff --git a/contrib/initramfs/Makefile.am b/contrib/initramfs/Makefile.am
index fefd676ce0f..52bdeb2afe5 100644
--- 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 e35354141d8..15f23c908b2 100755
--- 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 9249f15eb45..ba73f558a8a 100644
--- 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 -sf /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 a74d066bbae..e4aef672526 100644
--- 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
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.