diff --git a/hook-functions b/hook-functions index f48e743..e47a0d2 100644 --- a/hook-functions +++ b/hook-functions @@ -83,14 +83,18 @@ manual_add_modules() # Add required firmware for firmware in $(modinfo -k "${version}" -F firmware "${kmod}"); do if [ -e "${DESTDIR}/lib/firmware/${firmware}" ] \ - || [ -e "${DESTDIR}/lib/firmware/${version}/${firmware}" ]; then + || [ -e "${DESTDIR}/lib/firmware/${version}/${firmware}" ] \ + || [ -e "${DESTDIR}/lib/firmware/updates/${firmware}" ] \ + || [ -e "${DESTDIR}/lib/firmware/updates/${version}/${firmware}" ]; then continue fi # Only print warning for missing fw of loaded module # or forced loaded module if [ ! -e "/lib/firmware/${firmware}" ] \ - && [ ! -e "/lib/firmware/${version}/${firmware}" ] ; then + && [ ! -e "/lib/firmware/${version}/${firmware}" ] \ + && [ ! -e "/lib/firmware/updates/${firmware}" ] \ + && [ ! -e "/lib/firmware/updates/${version}/${firmware}" ]; then # Only warn about missing firmware if # /proc/modules exists if [ ! -e /proc/modules ] ; then @@ -105,7 +109,13 @@ manual_add_modules() continue fi - if [ -e "/lib/firmware/${version}/${firmware}" ]; then + if [ -e "/lib/firmware/updates/${version}/${firmware}" ]; then + copy_file firmware \ + "/lib/firmware/updates/${version}/${firmware}" + elif [ -e "/lib/firmware/updates/${firmware}" ]; then + copy_file firmware \ + "/lib/firmware/updates/${firmware}" + elif [ -e "/lib/firmware/${version}/${firmware}" ]; then copy_file firmware \ "/lib/firmware/${version}/${firmware}" else