summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>2008-03-22 13:06:52 +0000
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>2008-03-22 13:06:52 +0000
commitdba6910e1ee25f1b66fa2bb010b8d9e4499155cc (patch)
treea82cd8da3388e8e8a155c0f1c01fb62cb3ff43dd
parent65a8a2faaae0dea454c1d6250ec32ca6250c0a5e (diff)
parent379e6441f9af24ce817cad7e433ce9a599c4188c (diff)
merge of '5eb9119dd09c221e6e2fefd02b9fae130166b0c8'
and 'e4b7edf3b374a0483106a3cb0cb0f20b01315107'
-rw-r--r--packages/initrdscripts/files/init.sh8
-rw-r--r--packages/initrdscripts/initramfs-uniboot_1.0.bb2
2 files changed, 6 insertions, 4 deletions
diff --git a/packages/initrdscripts/files/init.sh b/packages/initrdscripts/files/init.sh
index 60d2e5da8b..cfac69b6d9 100644
--- a/packages/initrdscripts/files/init.sh
+++ b/packages/initrdscripts/files/init.sh
@@ -41,9 +41,11 @@ read_args() {
load_modules() {
for module in $MODULE_DIR/$1; do
- # Cannot redir to $CONSOLE here easily - may not be set yet
- echo "initramfs: Loading $module module"
- source $module
+ if [ -e "$module" ]; then
+ # Cannot redir to $CONSOLE here easily - may not be set yet
+ echo "initramfs: Loading $module module"
+ source $module
+ fi
done
}
diff --git a/packages/initrdscripts/initramfs-uniboot_1.0.bb b/packages/initrdscripts/initramfs-uniboot_1.0.bb
index 403db0b562..5a042ab748 100644
--- a/packages/initrdscripts/initramfs-uniboot_1.0.bb
+++ b/packages/initrdscripts/initramfs-uniboot_1.0.bb
@@ -1,5 +1,5 @@
SRC_URI = "file://init.sh"
-PR = "r8"
+PR = "r9"
DESCRIPTON = "A modular initramfs init script system."
RRECOMMENDS = "kernel-module-mtdblock"