i-t: rewrite hooks

This produces a leaner image, doesn't fail if zdb doesn't exist,
properly handles hostnameless systems, doesn't mention crypto modules
for no reason, doesn't add useless empty executable in hopes an
eight-year-old PR is merged, uses i-t builtins for all copies

Also optimize the checkbashisms filter to spawn one (or a few) awks
instead of one per regular file and remove initramfs/hooks therefrom due
to a command -v false positive

Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Signed-off-by: Ahelenia Ziemiańska <nabijaczleweli@nabijaczleweli.xyz>
Closes #12017

diff --git a/Makefile.am b/Makefile.am
index c44d64df01873681251f5d3c30c97ebc03b46cb8..32ac50f78ae2936524fd1902d278d877d5946e73 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -159,9 +159,10 @@ checkbashisms:
                                -o -name 'paxcheck.sh' -prune \
                                -o -name 'make_gitrev.sh' -prune \
                                -o -name '90zfs' -prune \
+                               -o -path '*initramfs/hooks' -prune \
                                -o -type f ! -name 'config*' \
                                ! -name 'libtool' \
-                       -exec sh -c 'awk "NR==1 && /#!.*bin\/sh.*/ {print FILENAME;}" "{}"' \;); \
+                       -exec awk 'FNR==1 && /^#!.*bin\/sh/ {print FILENAME}' {} \+); \
        else \
                echo "skipping checkbashisms because checkbashisms is not installed"; \
        fi

diff --git a/contrib/initramfs/hooks/zfs.in b/contrib/initramfs/hooks/zfs.in
index 4148526256509a9ccf1b3d1c2f6c380f5051cb37..7e401d1e87e18ed17c22bc43d15960340764c770 100755 (executable)
--- a/contrib/initramfs/hooks/zfs.in
+++ b/contrib/initramfs/hooks/zfs.in
@@ -3,115 +3,54 @@
 # Add OpenZFS filesystem capabilities to an initrd, usually for a native ZFS root.
 #
 
-# This hook installs udev rules for OpenZFS.
-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 @initconfdir@/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.
-COPY_EXEC_LIST="$COPY_EXEC_LIST /usr/bin/dirname /bin/hostname /sbin/blkid"
-COPY_EXEC_LIST="$COPY_EXEC_LIST /usr/bin/env"
-COPY_EXEC_LIST="$COPY_EXEC_LIST $(which systemd-ask-password)"
-
-# Explicitly specify all kernel modules because automatic dependency resolution
-# is unreliable on many systems.
-BASE_MODULES="zlib_deflate spl zavl zcommon znvpair zunicode zlua zfs icp"
-CRPT_MODULES="sun-ccm sun-gcm sun-ctr"
-MANUAL_ADD_MODULES_LIST="$BASE_MODULES"
-
-# Generic result code.
-RC=0
+if [ "$1" = "prereqs" ]; then
+       echo "udev"
+       exit
+fi
 
-case $1 in
-prereqs)
-       echo "$PREREQ"
-       exit 0
-       ;;
-esac
+. /usr/share/initramfs-tools/hook-functions
 
-for ii in $COPY_EXEC_LIST
-do
-       if [ ! -x "$ii" ]
-       then
-               echo "Error: $ii is not executable."
-               RC=2
-       fi
+for req in "@sbindir@/zpool" "@sbindir@/zfs" "@mounthelperdir@/mount.zfs"; do
+       copy_exec "$req" || {
+               echo "$req not available!" >&2
+               exit 2
+       }
 done
 
-if [ "$RC" -ne 0 ]
-then
-       exit "$RC"
+copy_exec "@sbindir@/zdb"
+copy_exec "@udevdir@/vdev_id"
+copy_exec "@udevdir@/zvol_id"
+if command -v systemd-ask-password > /dev/null; then
+       copy_exec "$(command -v systemd-ask-password)"
 fi
 
-. /usr/share/initramfs-tools/hook-functions
-
-mkdir -p "$DESTDIR/etc/"
-
-# ZDB uses pthreads for some functions, but the library dependency is not
-# automatically detected. The `find` utility and extended `cp` options are
-# used here because libgcc_s.so could be in a subdirectory of /lib for
-# multi-arch installations.
-cp --target-directory="$DESTDIR" --parents $(find /lib/ -type f -name libgcc_s.so.1)
+# We use pthreads, but i-t from buster doesn't automatically
+# copy this indirect dependency: this can be removed when buster finally dies.
+for libgcc in $(find /lib/ -type f -name libgcc_s.so.[1-9]); do
+       copy_exec "$libgcc"
+done
 
-if [ @LIBFETCH_DYNAMIC@ != 0 ]
-then
-       for l in $(find /lib/ -name @LIBFETCH_SONAME@)
-       do
-               copy_exec "$l"
+if [ @LIBFETCH_DYNAMIC@ != 0 ]; then
+       for libfetch in $(find /lib/ -name @LIBFETCH_SONAME@); do
+               copy_exec "$libfetch"
        done
 fi
 
-for ii in $COPY_EXEC_LIST
-do
-       copy_exec "$ii"
-done
+copy_file config "/etc/hostid"
+copy_file cache  "@sysconfdir@/zfs/zpool.cache"
+copy_file config "@initconfdir@/zfs"
+copy_file config "@sysconfdir@/zfs/zfs-functions"
+copy_file config "@sysconfdir@/zfs/vdev_id.conf"
+copy_file rule   "@udevruledir@/60-zvol.rules"
+copy_file rule   "@udevruledir@/69-vdev.rules"
 
-for ii in $COPY_FILE_LIST
-do
-       dir=$(dirname "$ii")
-       [ -d "$dir" ] && mkdir -p "$DESTDIR/$dir"
-       [ -f "$ii" ] && cp -p "$ii" "$DESTDIR/$ii"
-done
+manual_add_modules zfs
 
-for ii in $MANUAL_ADD_MODULES_LIST
-do
-       manual_add_modules "$ii"
-done
-
-if [ -f "/etc/hostname" ]
-then
-       cp -p "/etc/hostname" "$DESTDIR/etc/"
+if [ -f "/etc/hostname" ]; then
+       copy_file config "/etc/hostname"
 else
-       hostname >"$DESTDIR/etc/hostname"
+       hostname="$(mktemp -t hostname.XXXXXXXXXX)"
+       hostname > "$hostname"
+       copy_file config "$hostname" "/etc/hostname"
+       rm -f "$hostname"
 fi
-
-for ii in zfs zfs.conf spl spl.conf
-do
-       if [ -f "/etc/modprobe.d/$ii" ]; then
-               if [ ! -d "$DESTDIR/etc/modprobe.d" ]; then
-                       mkdir -p $DESTDIR/etc/modprobe.d
-               fi
-               cp -p "/etc/modprobe.d/$ii" $DESTDIR/etc/modprobe.d/
-       fi
-done
-
-# With pull request #1476 (not yet merged) comes a verbose warning
-# if /usr/bin/net doesn't exist or isn't executable. Just create
-# a dummy...
-[ ! -d "$DESTDIR/usr/bin" ] && mkdir -p "$DESTDIR/usr/bin"
-if [ ! -x "$DESTDIR/usr/bin/net" ]; then
-    touch "$DESTDIR/usr/bin/net"
-    chmod +x "$DESTDIR/usr/bin/net"
-fi
-
-exit 0

diff --git a/contrib/initramfs/hooks/zfsunlock.in b/contrib/initramfs/hooks/zfsunlock.in
index d451726545dbbaa15407d4ff78c33df99f7011bd..4776087d9a76c02b0ce2376bda62ef70c031a741 100644 (file)
--- a/contrib/initramfs/hooks/zfsunlock.in
+++ b/contrib/initramfs/hooks/zfsunlock.in
@@ -1,17 +1,9 @@
 #!/bin/sh
 
-PREREQ="dropbear"
-
-prereqs() {
-    echo "$PREREQ"
-}
-
-case "$1" in
-    prereqs)
-        prereqs
-        exit 0
-    ;;
-esac
+if [ "$1" = "prereqs" ]; then
+       echo "dropbear"
+       exit
+fi
 
 . /usr/share/initramfs-tools/hook-functions