From b8ebd1d79f47b5c717ee17f40557e5d548df3198 Mon Sep 17 00:00:00 2001
From: Andy Fiddaman <omnios@citrus-it.co.uk>
Date: Thu, 15 Apr 2021 13:22:48 +0000
Subject: [PATCH] Installer miniroot should include the pcieadm

---
 build/build_miniroot | 5 ++++-
 data/filelist        | 2 ++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/build/build_miniroot b/build/build_miniroot
index eee64b2..e0b3ef4 100755
--- a/build/build_miniroot
+++ b/build/build_miniroot
@@ -134,7 +134,7 @@ SYSTEM="system/boot/real-mode system/boot/loader
     system/library system/network
     system/prerequisite/gnu system/storage/luxadm
     system/storage/fibre-channel/port-utility developer/debug/mdb
-    system/bhyve"
+    system/bhyve diagnostic/pci"
 
 DEBUG_PKGS="system/dtrace developer/dtrace"
 
@@ -340,6 +340,9 @@ EOM
     cp $SRCDIR/bin/dmesg $ROOTDIR/usr/bin/dmesg
     chmod 0755 $ROOTDIR/usr/bin/dmesg
 
+    # Link the PCI utility to /usr/bin for the installer.
+    ln -s ../lib/pci/pcieadm $ROOTDIR/usr/bin/pcieadm
+
     chkpt cull
     ;;
 
diff --git a/data/filelist b/data/filelist
index f2e4011..bceba4c 100644
--- a/data/filelist
+++ b/data/filelist
@@ -131,6 +131,7 @@
 /usr/bin/mv
 /usr/bin/nawk
 /usr/bin/nc
+/usr/bin/pcieadm
 /usr/bin/pfiles
 /usr/bin/pgrep
 /usr/bin/pkill
@@ -201,6 +202,7 @@
 /usr/kernel/fs/amd64/pcfs
 /usr/kernel/pcbe
 /usr/kernel/pcbe/amd64
+/usr/lib/pci/pcieadm
 /usr/platform/i86pc/lib/fm/topo/maps/chassis-hc-topology.xml
 /usr/platform/i86pc/lib/fm/topo/maps/chip-hc-topology.xml
 /usr/platform/i86pc/lib/fm/topo/maps/fan-hc-topology.xml