From b4cb437c6595ff8ac13506e502fe04b1a60c4e04 Mon Sep 17 00:00:00 2001
From: Richard Purdie <richard@openedhand.com>
Date: Tue, 9 May 2006 18:38:19 +0000
Subject: Merge packages changes from OE into poky.

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@386 311d38ba-8fff-0310-9ca6-ca027cbcb966
---
 .../packages/update-modules/update-modules-1.0/update-modules | 11 ++++++++++-
 openembedded/packages/update-modules/update-modules_1.0.bb    |  3 +--
 2 files changed, 11 insertions(+), 3 deletions(-)

(limited to 'openembedded/packages/update-modules')

diff --git a/openembedded/packages/update-modules/update-modules-1.0/update-modules b/openembedded/packages/update-modules/update-modules-1.0/update-modules
index 2f817c5ee..636fe1c0d 100755
--- a/openembedded/packages/update-modules/update-modules-1.0/update-modules
+++ b/openembedded/packages/update-modules/update-modules-1.0/update-modules
@@ -173,15 +173,24 @@ for cfg in /etc/modutils/* $CONF ; do
 	fi
 done
 
+first_time=0
+if [ ! -f $MODULESFILE ]; then
+  first_time=1
+fi
+
 mv "$MODCONFTMPFILE" "$MODCONFFILE"
 mv "$MODULESTMPFILE" "$MODULESFILE"
 
+if [ $first_time -eq 1 ]; then
+  /etc/init.d/modutils.sh || true
+fi
+
 # We also call depmod here to stop insmod from complaining that modules.conf
 # is more recent then modules.dep
 #
 if [ -d "`depdir`" -a -f /proc/modules ]
 then
-	depmod -a || true
+	depmod -A || true
 fi
 
 exit 0
diff --git a/openembedded/packages/update-modules/update-modules_1.0.bb b/openembedded/packages/update-modules/update-modules_1.0.bb
index 297b1bf7b..dc4c3c0d9 100644
--- a/openembedded/packages/update-modules/update-modules_1.0.bb
+++ b/openembedded/packages/update-modules/update-modules_1.0.bb
@@ -2,7 +2,7 @@ SECTION = "base"
 DESCRIPTION = "Script to manage module configuration files"
 LICENSE = "GPLv2"
 PACKAGE_ARCH = "all"
-PR = "r3"
+PR = "r4"
 
 SRC_URI = "file://update-modules"
 
@@ -11,7 +11,6 @@ if [ "x$D" != "x" ]; then
 	exit 1
 fi
 update-modules
-/etc/init.d/modutils.sh
 }
 
 do_install() {
-- 
cgit v1.2.3