From 83edd836cbd87464f85880fdb316cd9b3ba3591b Mon Sep 17 00:00:00 2001
From: Julia Kreger <juliaashleykreger@gmail.com>
Date: Fri, 30 Aug 2019 12:29:03 -0400
Subject: [PATCH] Add file to tinybuild's IPA image

We need the ``file`` command to examine the magic numbers in the
metadata of block devices to determine if a bootloader is persent.

Change-Id: I5e73113148e721c6644bbfd626c563e72468d030
---
 tinyipa/build_files/finalreqs.lst | 3 ++-
 tinyipa/finalise-tinyipa.sh       | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/tinyipa/build_files/finalreqs.lst b/tinyipa/build_files/finalreqs.lst
index 93fc3a5..bf06684 100644
--- a/tinyipa/build_files/finalreqs.lst
+++ b/tinyipa/build_files/finalreqs.lst
@@ -3,6 +3,7 @@ coreutils.tcz
 dmidecode.tcz
 gdisk.tcz
 glib2.tcz
+file.tcz
 hdparm.tcz
 iproute2.tcz
 ipv6-4.8.17-tinycore64.tcz
@@ -14,4 +15,4 @@ raid-dm-4.8.17-tinycore64.tcz
 scsi-4.8.17-tinycore64.tcz
 smartmontools.tcz
 udev-lib.tcz
-util-linux.tcz
+util-linux.tcz
\ No newline at end of file
diff --git a/tinyipa/finalise-tinyipa.sh b/tinyipa/finalise-tinyipa.sh
index dace708..953aec9 100755
--- a/tinyipa/finalise-tinyipa.sh
+++ b/tinyipa/finalise-tinyipa.sh
@@ -205,7 +205,7 @@ echo "Symlink all from /usr/local/sbin to /usr/sbin"
 pushd "$FINALDIR/usr/local/sbin"
 for target in *; do
     if [ ! -f "$FINALDIR/usr/sbin/$target" ]; then
-        $CHROOT_CMD ln -s "/usr/local/sbin/$target" "/usr/sbin/$target"
+        $CHROOT_CMD ln -sf "/usr/local/sbin/$target" "/usr/sbin/$target"
     fi
 done
 popd
@@ -214,7 +214,7 @@ echo "Symlink all from /usr/local/bin to /usr/bin"
 pushd "$FINALDIR/usr/local/bin"
 for target in *; do
     if [ ! -f "$FINALDIR/usr/bin/$target" ]; then
-        $CHROOT_CMD ln -s "/usr/local/bin/$target" "/usr/bin/$target"
+        $CHROOT_CMD ln -sf "/usr/local/bin/$target" "/usr/bin/$target"
     fi
 done
 popd