From: Ralph Ronnquist <rrq@rrq.au>
Date: Thu, 19 Sep 2024 11:49:51 +0000 (+1000)
Subject: Minor touchup to the busybox override step for libc6
X-Git-Url: https://git.rrq.au/?a=commitdiff_plain;h=0975489c62fe8bc14ee4c81dff777c963a15edee;p=rrq%2Fbespoke-installer.git

Minor touchup to the busybox override step for libc6
---

diff --git a/build-installer.sh b/build-installer.sh
index ae627bb..8f7ba76 100755
--- a/build-installer.sh
+++ b/build-installer.sh
@@ -108,8 +108,8 @@ EOF
 # link).
 target_dpkg -E --unpack $(debs busybox-static)
 executable $INITRD/bin/sh <<EOF
-#!$(pwd)/$INITRD/bin/busybox sh
-echo "*** The do-nothing /bin/sh is used here ***" >&2
+#!$(realpath $INITRD)/bin/busybox sh
+echo "### /bin/sh OVERRIDE " >&2
 EOF
 ln $INITRD/bin/busybox $INITRD/sbin/losetup
 target_dpkg -E --install $(debs libc6)
@@ -131,7 +131,7 @@ for P in ${UDEBS[@]} ; do
     echo "UDEB install = $P" >&2
     target_dpkg -E --install --force-overwrite $(debs $P)
 done
-
+ln -sTf busybox $INITRD/bin/sh
 ######################################################################
 # Make some additional patches in the initrd to support the
 # installation process.