From ccc4ea5e37d2e48a94fd119848e2d31dec2662d7 Mon Sep 17 00:00:00 2001
From: CyberLeo <cyberleo@cyberleo.net>
Date: Mon, 3 Oct 2011 11:07:11 -0500
Subject: [PATCH] script/gentree: handle port modules stored in /boot/modules
 as well

---
 script/gentree | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/script/gentree b/script/gentree
index 9b323db..59c17e4 100755
--- a/script/gentree
+++ b/script/gentree
@@ -235,15 +235,17 @@ do_imgboot() {
 
   # Link all modules into /modules, as an alternative search path
   ( cd "${sboot}/kernel" && find . -name '*.ko' -o -name "${conf}" | cpio -p --link "${sroot}/modules" ) || chk
+  ( cd "${sboot}/modules" && find . -name '*.ko' -o -name "${conf}" | cpio -p --link "${sroot}/modules" ) || chk
 
   # Remove all modules from the root fs that are preloaded by the preloader
   cat "${sboot}/loader.conf" | grep '_load=' | sed -e 's#^\(.*\)_load=.*$#'"${sroot}/modules/"'\1.ko#' | xargs rm -f
 
   # Remove all modules from the boot fs that are present in the root fs
   ( cd "${sroot}/modules" && ls -1 ) | sed -e 's#^#'"${sboot}/kernel/"'#' | xargs rm -f
+  ( cd "${sroot}/modules" && ls -1 ) | sed -e 's#^#'"${sboot}/modules/"'#' | xargs rm -f
 
   # Rebuild linker hints in both places, to make sure the kernel can find everything once running
-  kldxref "${sboot}/kernel" "${sroot}/modules"
+  kldxref "${sboot}/kernel" "${sboot}/modules" "${sroot}/modules"
 
   # Gzip kernel to save boot space
   chk onelink "${sboot}/kernel/kernel"
-- 
2.42.0