aboutsummaryrefslogtreecommitdiffstats
path: root/contrib
diff options
context:
space:
mode:
Diffstat (limited to 'contrib')
-rw-r--r--contrib/initramfs/Makefile.am16
-rwxr-xr-xcontrib/initramfs/hooks/zfs.in6
2 files changed, 15 insertions, 7 deletions
diff --git a/contrib/initramfs/Makefile.am b/contrib/initramfs/Makefile.am
index fefd676ce..52bdeb2af 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 e35354141..15f23c908 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.