fastboot: modutils: Run depmod conditionally.

diff --git a/packages/modutils/files/modutils.sh b/packages/modutils/files/modutils.sh
index 8928127..9514b1d 100755 (executable)
--- a/packages/modutils/files/modutils.sh
+++ b/packages/modutils/files/modutils.sh
@@ -1,27 +1,26 @@
 #!/bin/sh
 
 LOAD_MODULE=modprobe
-[ -f /proc/modules ] || exit 0
-[ -f /etc/modules ] || exit 0
 [ -e /sbin/modprobe ] || LOAD_MODULE=insmod
 
-if [ ! -e /sbin/depmod ]; then
-       [ -f /lib/modules/`uname -r`/modules.dep ] || LOAD_MODULE=insmod
-else 
+if [ -e /sbin/depmod -a ! -f /lib/modules/`uname -r`/modules.dep ]; then
        [ "$VERBOSE" != no ] && echo "Calculating module dependencies ..."
        depmod -Ae
 fi
 
-[ "$VERBOSE" != no ] && echo -n "Loading modules: "
-(cat /etc/modules; echo; ) |
-while read module args
-do
-       case "$module" in
-               \#*|"") continue ;;
-       esac
-       [ "$VERBOSE" != no ] && echo -n "$module "
-       eval "$LOAD_MODULE $module $args >/dev/null 2>&1"
-done
-[ "$VERBOSE" != no ] && echo
+if [ -f /proc/modules ]; then
+       if [ -f /etc/modules ]; then
+               [ "$VERBOSE" != no ] && echo -n "Loading modules: "
+               while read module args
+               do
+                       case "$module" in
+                               \#*|"") continue ;;
+                       esac
+                       [ "$VERBOSE" != no ] && echo -n "$module "
+                       eval "$LOAD_MODULE $module $args >/dev/null 2>&1"
+               done < /etc/modules
+               [ "$VERBOSE" != no ] && echo
+       fi
+fi
 
-exit 0
+: exit 0

diff --git a/packages/modutils/modutils-initscripts.bb b/packages/modutils/modutils-initscripts.bb
index bf51ca8..07f4810 100644 (file)
--- a/packages/modutils/modutils-initscripts.bb
+++ b/packages/modutils/modutils-initscripts.bb
@@ -2,7 +2,7 @@ SECTION = "base"
 DESCRIPTION = "modutils configuration files"
 LICENSE = "PD"
 SRC_URI = "file://modutils.sh"
-PR = "r2"
+PR = "r3"
 
 INITSCRIPT_NAME = "modutils.sh"
 INITSCRIPT_PARAMS = "start 20 S ."