From: Philipp Zabel <philipp.zabel@gmail.com>
Date: Sat, 22 Mar 2008 12:07:20 +0000 (+0000)
Subject: initramfs-uniboot-1.0: only source existing files in load_modules
X-Git-Tag: Release-2010-05/1~7294^2~4^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=379e6441f9af24ce817cad7e433ce9a599c4188c;p=openembedded.git

initramfs-uniboot-1.0: only source existing files in load_modules
* this avoids "/init: source: 64: Can't open /initrd.d/0*" for initramfs
  images built without the bootldr-buster module.
---

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"