[oe-commits] Chia-I Wu : fastboot: modutils: Run depmod conditionally.

[GIT User account]

Module: openembedded.git
Branch: org.openembedded.dev
Commit: cec62eba2e9247f80fb5fe8e9a539c773a203eec
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=cec62eba2e9247f80fb5fe8e9a539c773a203eec

Author: Chia-I Wu <olv at openmoko.com>
Date:   Mon Nov 17 18:08:42 2008 +0800

fastboot: modutils: Run depmod conditionally.

---

 packages/modutils/files/modutils.sh       |   33 ++++++++++++++---------------
 packages/modutils/modutils-initscripts.bb |    2 +-
 2 files changed, 17 insertions(+), 18 deletions(-)

diff --git a/packages/modutils/files/modutils.sh b/packages/modutils/files/modutils.sh
index 8928127..9514b1d 100755
--- 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
--- 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 ."