Bug#792910: [PATCH initramfs-tools] hook-functions: Stop force-loading drivers found through sysfs when MODULES=dep

[Ben Hutchings]

Currently we're duplicating the work of udev and generating warnings
for drivers that are always built-in.

Closes: #792910
Signed-off-by: Ben Hutchings <b...@decadent.org.uk>
---
 hook-functions | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/hook-functions b/hook-functions
index 6aef679..60f798c 100644
--- a/hook-functions
+++ b/hook-functions
@@ -228,7 +228,7 @@ sys_walk_mod_add()
                if [ -e "${device_path}/modalias" ]; then
                        modalias=$(cat "${device_path}/modalias")
                        if [ -n "${modalias}" ]; then
-                               force_load "${modalias}"
+                               manual_add_modules "${modalias}"
                        fi
                fi
 
@@ -237,7 +237,7 @@ sys_walk_mod_add()
                if [ -e "$driver_path" ]; then
                        module="$(basename $(readlink -f $driver_path))"
                        if [ -n "${module}" ]; then
-                               force_load "${module}"
+                               manual_add_modules "${module}"
                        fi
                fi
 

signature.asc
Description: Digital signature