From 51de1be0a82967582b024dd554c02e457fe8e917 Mon Sep 17 00:00:00 2001 From: Michael Prokop Date: Sat, 20 Feb 2010 17:01:45 +0100 Subject: hook-functions: Avoid firmware copy error. Fix a2127d33 for systems without /proc/modules because the check has the wrong logic order. (closes: #570678) Signed-off-by: maximilian attems --- hook-functions | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'hook-functions') diff --git a/hook-functions b/hook-functions index 9d59dc1..8376be3 100644 --- a/hook-functions +++ b/hook-functions @@ -71,8 +71,13 @@ manual_add_modules() # Only print warning for missing fw of loaded module # or forced loaded module if [ ! -e "/lib/firmware/${firmware}" ] \ - && [ ! -e "/lib/firmware/${version}/${firmware}" ] \ - && [ -e /proc/modules ]; then + && [ ! -e "/lib/firmware/${version}/${firmware}" ] ; then + # Only warn about missing firmware if + # /proc/modules exists + if [ ! -e /proc/modules ] ; then + continue + fi + if grep -q "^$(basename "${mam_x}" .ko)[[:space:]]" \ /proc/modules \ || grep -q "^$(basename "${mam_x}" .ko)" \ -- cgit v1.2.3