From 5888eed0d17472612abae41f32de95ed1177ad23 Mon Sep 17 00:00:00 2001
From: Daniel Mentz <danielmentz@google.com>
Date: Wed, 28 Apr 2021 15:58:43 -0700
Subject: [PATCH] init.insmod.sh: Find modules in different directories

Currenlty, kernel modules are only looked for in /vendor/lib/modules/.
With this change, we enable kernel modules to be stored under paths that
contain the kernel version string e.g.
/vendor/lib/modules/5.10.31-gd527c4be4795-dirty/
This aligns better with the kernel build system.

Bug: 185184472
Change-Id: I40db76f0409808700acd2d5524f8f3d606b3114f
---
 init.insmod.sh | 20 +++++++++++++++++---
 1 file changed, 17 insertions(+), 3 deletions(-)

diff --git a/init.insmod.sh b/init.insmod.sh
index 5d400639..a49fae59 100755
--- a/init.insmod.sh
+++ b/init.insmod.sh
@@ -7,6 +7,20 @@
 ### ...                                                   ###
 #############################################################
 
+modules_dir=
+
+for f in /vendor/lib/modules/*/modules.dep /vendor/lib/modules/modules.dep; do
+  if [[ -f "$f" ]]; then
+    modules_dir="$(dirname "$f")"
+    break
+  fi
+done
+
+if [[ -z "${modules_dir}" ]]; then
+  echo "Unable to locate kernel modules directory" 2>&1
+  exit 1
+fi
+
 # imitates wait_for_file() in init
 wait_for_file()
 {
@@ -26,8 +40,8 @@ install_display_drivers()
   if [[ -z "$panel_drv" ]]; then
     panel_drv="panel-samsung-emul"
   fi
-  modprobe -d /vendor/lib/modules exynos-drm.ko
-  modprobe -d /vendor/lib/modules $panel_drv.ko
+  modprobe -d "${modules_dir}" exynos-drm.ko
+  modprobe -d "${modules_dir}" $panel_drv.ko
 }
 
 if [ $# -eq 1 ]; then
@@ -47,7 +61,7 @@ if [ -f $cfg_file ]; then
       "insmod") insmod $arg ;;
       "setprop") setprop $arg 1 ;;
       "enable") echo 1 > $arg ;;
-      "modprobe") modprobe -a -d /vendor/lib/modules $arg ;;
+      "modprobe") modprobe -a -d "${modules_dir}" $arg ;;
       "wait") wait_for_file $arg ;;
       "install_display_drivers") install_display_drivers ;;
     esac