Ship initramfs zdev hook in zfs-initramfs

Instead of in zfsutils-linux

Signed-off-by: Antonio Russo <antonio.e.russo@gmail.com>

diff --git a/debian/tree/zfs-initramfs/usr/share/initramfs-tools/conf.d/zfs b/debian/tree/zfs-initramfs/usr/share/initramfs-tools/conf.d/zfs
new file mode 100644 (file)
index 0000000..5103cc4
--- /dev/null
+++ b/debian/tree/zfs-initramfs/usr/share/initramfs-tools/conf.d/zfs
@@ -0,0 +1,8 @@
+for x in $(cat /proc/cmdline)
+do
+       case $x in
+               root=ZFS=*)
+                       BOOT=zfs
+                       ;;
+       esac
+done

diff --git a/debian/tree/zfs-initramfs/usr/share/initramfs-tools/hooks/zdev b/debian/tree/zfs-initramfs/usr/share/initramfs-tools/hooks/zdev
new file mode 100755 (executable)
index 0000000..0cf21a4
--- /dev/null
+++ b/debian/tree/zfs-initramfs/usr/share/initramfs-tools/hooks/zdev
@@ -0,0 +1,67 @@
+#!/bin/sh
+#
+# Add udev rules for ZoL to the initrd.
+#
+
+PREREQ="udev"
+PREREQ_UDEV_RULES="60-zvol.rules 69-vdev.rules"
+COPY_EXEC_LIST="/lib/udev/zvol_id /lib/udev/vdev_id"
+
+# Generic result code.
+RC=0
+
+case $1 in
+prereqs)
+       echo "$PREREQ"
+       exit 0
+       ;;
+esac
+
+for ii in $COPY_EXEC_LIST
+do
+       if [ ! -x "$ii" ]
+       then
+               echo "Error: $ii is not executable."
+               RC=2
+       fi
+done
+
+if [ "$RC" -ne 0 ]
+then
+       exit "$RC"
+fi
+
+. /usr/share/initramfs-tools/hook-functions
+
+mkdir -p "$DESTDIR/lib/udev/rules.d/"
+for ii in $PREREQ_UDEV_RULES
+do
+       if [ -e "/etc/udev/rules.d/$ii" ]
+       then
+               cp -p "/etc/udev/rules.d/$ii" "$DESTDIR/lib/udev/rules.d/"
+       elif [ -e "/lib/udev/rules.d/$ii" ]
+       then
+               cp -p "/lib/udev/rules.d/$ii" "$DESTDIR/lib/udev/rules.d/"
+       else
+               echo "Error: Missing udev rule: $ii"
+               echo "       This file must be in the /etc/udev/rules.d or /lib/udev/rules.d directory."
+               exit 1
+       fi
+done
+
+for ii in $COPY_EXEC_LIST
+do
+       copy_exec "$ii"
+done
+
+if [ -f '/etc/default/zfs' -a -r '/etc/default/zfs' ]
+then
+       mkdir -p "$DESTDIR/etc/default"
+       cp -a '/etc/default/zfs' "$DESTDIR/etc/default/"
+fi
+
+if [ -d '/etc/zfs' -a -r '/etc/zfs' ]
+then
+       mkdir -p "$DESTDIR/etc"
+       cp -a '/etc/zfs' "$DESTDIR/etc/"
+fi

diff --git a/debian/tree/zfsutils-linux/usr/share/initramfs-tools/hooks/zdev b/debian/tree/zfsutils-linux/usr/share/initramfs-tools/hooks/zdev
deleted file mode 100755 (executable)
index 0cf21a4..0000000
--- a/debian/tree/zfsutils-linux/usr/share/initramfs-tools/hooks/zdev
+++ /dev/null
@@ -1,67 +0,0 @@
-#!/bin/sh
-#
-# Add udev rules for ZoL to the initrd.
-#
-
-PREREQ="udev"
-PREREQ_UDEV_RULES="60-zvol.rules 69-vdev.rules"
-COPY_EXEC_LIST="/lib/udev/zvol_id /lib/udev/vdev_id"
-
-# Generic result code.
-RC=0
-
-case $1 in
-prereqs)
-       echo "$PREREQ"
-       exit 0
-       ;;
-esac
-
-for ii in $COPY_EXEC_LIST
-do
-       if [ ! -x "$ii" ]
-       then
-               echo "Error: $ii is not executable."
-               RC=2
-       fi
-done
-
-if [ "$RC" -ne 0 ]
-then
-       exit "$RC"
-fi
-
-. /usr/share/initramfs-tools/hook-functions
-
-mkdir -p "$DESTDIR/lib/udev/rules.d/"
-for ii in $PREREQ_UDEV_RULES
-do
-       if [ -e "/etc/udev/rules.d/$ii" ]
-       then
-               cp -p "/etc/udev/rules.d/$ii" "$DESTDIR/lib/udev/rules.d/"
-       elif [ -e "/lib/udev/rules.d/$ii" ]
-       then
-               cp -p "/lib/udev/rules.d/$ii" "$DESTDIR/lib/udev/rules.d/"
-       else
-               echo "Error: Missing udev rule: $ii"
-               echo "       This file must be in the /etc/udev/rules.d or /lib/udev/rules.d directory."
-               exit 1
-       fi
-done
-
-for ii in $COPY_EXEC_LIST
-do
-       copy_exec "$ii"
-done
-
-if [ -f '/etc/default/zfs' -a -r '/etc/default/zfs' ]
-then
-       mkdir -p "$DESTDIR/etc/default"
-       cp -a '/etc/default/zfs' "$DESTDIR/etc/default/"
-fi
-
-if [ -d '/etc/zfs' -a -r '/etc/zfs' ]
-then
-       mkdir -p "$DESTDIR/etc"
-       cp -a '/etc/zfs' "$DESTDIR/etc/"
-fi

diff --git a/debian/zfs b/debian/zfs
deleted file mode 100644 (file)
index 5103cc4..0000000
--- a/debian/zfs
+++ /dev/null
@@ -1,8 +0,0 @@
-for x in $(cat /proc/cmdline)
-do
-       case $x in
-               root=ZFS=*)
-                       BOOT=zfs
-                       ;;
-       esac
-done

diff --git a/debian/zfs-initramfs.install b/debian/zfs-initramfs.install
index 768fec6c985a453fd31ed0bd564c2d8f61628f42..222620947f106b991ecf86096f79c6855eb11fd9 100644 (file)
--- a/debian/zfs-initramfs.install
+++ b/debian/zfs-initramfs.install
@@ -1,2 +1,2 @@
-debian/zfs usr/share/initramfs-tools/conf.d/
+../tree/zfs-initramfs/* /
 usr/share/initramfs-tools/*