From 205dc2171862078d4a8ff4ee44ff807153f6a947 Mon Sep 17 00:00:00 2001
From: Diederik de Haas <didi.debian@cknow.org>
Date: Sun, 6 Nov 2022 20:17:27 +0100
Subject: [PATCH] Document and complete rpi-resizerootfs hook

The main trigger was a missing program in the initramfs, which probably
everyone assumed was there ... but wasn't. (See next commit ...)

So instead list every program that we need/call, so that we *know* that
that program is included in the initramfs.
Also document this new 'policy'.

Also group the programs by the package which has them and sort the list
alphabetically by the package names.
---
 .../initramfs-tools/hooks/rpi-resizerootfs    | 33 +++++++++++++++----
 1 file changed, 27 insertions(+), 6 deletions(-)

diff --git a/rootfs/etc/initramfs-tools/hooks/rpi-resizerootfs b/rootfs/etc/initramfs-tools/hooks/rpi-resizerootfs
index f4776aa..76df689 100755
--- a/rootfs/etc/initramfs-tools/hooks/rpi-resizerootfs
+++ b/rootfs/etc/initramfs-tools/hooks/rpi-resizerootfs
@@ -13,11 +13,32 @@ esac
 
 . /usr/share/initramfs-tools/hook-functions
 
-# XXX: tail and realpath are included by default, right?
-#copy_exec /usr/bin/realpath
-#copy_exec /usr/bin/tail
-copy_exec /sbin/blkid
-copy_exec /bin/lsblk
+# List ALL the programs we need, because we explicitly call them
+# Don't *assume* it will be included!
+# The update-initramfs script will figure out any dependencies
+# that also need to be included, so lets not do that
+#
+# Find the path as used by the package itself; usrmerge may not be used
+
+# from coreutils
+copy_exec /usr/bin/realpath
+copy_exec /usr/bin/tail
+copy_exec /usr/bin/test
+
+# from e2fsprogs
+copy_exec /sbin/resize2fs
+
+# from grep
+copy_exec /bin/grep
+
+# from mount
+copy_exec /bin/mount
+copy_exec /bin/umount
+
+# from parted
 copy_exec /sbin/parted
 copy_exec /sbin/partprobe
-copy_exec /sbin/resize2fs
+
+# from util-linux
+copy_exec /bin/lsblk
+copy_exec /sbin/blkid