Merge ~mwhudson/finalrd:better-lib-detection into finalrd:master

[Michael Hudson-Doyle]

 finalrd (8) UNRELEASED; urgency=medium
 .
   * Improve library detection in finalrd.sh.

Turns out accidentally testing my glibc snapshot found something.

[Steve Langasek (vorlon)]

review: Approve

diff --git a/debian/changelog b/debian/changelog
index 5d560d5..85920d4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+finalrd (8) UNRELEASED; urgency=medium
+
+  * Improve library detection in finalrd.sh.
+
+ -- Michael Hudson-Doyle <[e-mail]>  Thu, 29 Jul 2021 12:45:27 +1200
+
 finalrd (7) hirsute; urgency=medium
 
   * Drop build-dependency on obsolete dh-systemd
diff --git a/finalrd.sh b/finalrd.sh
index cffa94b..f623f8c 100755
--- a/finalrd.sh
+++ b/finalrd.sh
@@ -25,12 +25,11 @@ mount -o remount,exec /run
 # our shutdown sequence is to be controled by systemd-shutdown which
 # will unmount all the things, and run our hooks
 
-LD=`grep -Eow '/.*ld-.*.so' /proc/self/maps | head -1`
 for bin in /bin/sh /lib/systemd/systemd-shutdown
 do
     rm -f /run/finalrd-libs.conf
     touch /run/finalrd-libs.conf
-    for lib in `$LD --list $bin | grep -Eow "/.* "`
+    for lib in `LD_TRACE_LOADED_OBJECTS=1 $bin | grep -Eow "/.* "`
     do
         if [ "$lib" = '=>' ]
         then