From 5774cc330c144f31a5aec00e016395149e810bb7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=BD=D0=B0=D0=B1?= <nabijaczleweli@nabijaczleweli.xyz>
Date: Tue, 26 Apr 2022 15:41:59 +0200
Subject: [PATCH] Respect fw_path_para in add_firmware()

/sys/module/firmware_class/parameters/path, if any, is added before
anything else in the module loading path:
  https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/drivers/base/firmware_loader/main.c?h=v5.17#n406
---
 hook-functions | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/hook-functions b/hook-functions
index 95bd584..e9f09c0 100644
--- a/hook-functions
+++ b/hook-functions
@@ -28,7 +28,7 @@ force_load()
 }
 
 # Takes a file containing a list of modules to be added as an
-# argument, figures out dependancies, and adds them.
+# argument, figures out dependencies, and adds them.
 #
 # Input file syntax:
 #
@@ -57,18 +57,23 @@ add_modules_from_file()
 # whether a warning should be printed in that case.)
 add_firmware()
 {
-	local firmware fwloc
+	local firmware fwloc fw_path_para path_firmware
 
 	firmware="${1}"
 
-	if [ -e "${DESTDIR}/lib/firmware/updates/${version?}/${firmware}" ] \
+	read -r fw_path_para < /sys/module/firmware_class/parameters/path
+
+	if { [ -n "$fw_path_para" ] && [ -e "${DESTDIR}/${fw_path_para}/${firmware}" ]; } \
+	|| [ -e "${DESTDIR}/lib/firmware/updates/${version?}/${firmware}" ] \
 	|| [ -e "${DESTDIR}/lib/firmware/updates/${firmware}" ] \
 	|| [ -e "${DESTDIR}/lib/firmware/${version}/${firmware}" ] \
 	|| [ -e "${DESTDIR}/lib/firmware/${firmware}" ]; then
 		return 0
 	fi
 
-	for fwloc in "/lib/firmware/updates/${version}/${firmware}" \
+	[ -n "$fw_path_para" ] && path_firmware="${fw_path_para}/${firmware}" || path_firmware=
+	for fwloc in "$path_firmware" \
+		"/lib/firmware/updates/${version}/${firmware}" \
 		"/lib/firmware/updates/${firmware}" \
 		"/lib/firmware/${version}/${firmware}" \
 		"/lib/firmware/${firmware}"; do