[oe-commits] org.oe.dev initramfs-uniboot-1.0: only source existing files in load_modules

pH5 commit oe at amethyst.openembedded.net
Sat Mar 22 12:50:56 UTC 2008


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.

Author: pH5 at openembedded.org
Branch: org.openembedded.dev
Revision: e4b7edf3b374a0483106a3cb0cb0f20b01315107
ViewMTN: http://monotone.openembedded.org/revision/info/e4b7edf3b374a0483106a3cb0cb0f20b01315107
Files:
1
packages/initrdscripts/files/init.sh
packages/initrdscripts/initramfs-uniboot_1.0.bb
Diffs:

#
# mt diff -r5b214d5b98fc841f5638a7aae10346be791d4f6e -re4b7edf3b374a0483106a3cb0cb0f20b01315107
#
#
#
# patch "packages/initrdscripts/files/init.sh"
#  from [f01a2b1d615165dd1f22c6ce448caad76fe2bc21]
#    to [28d18ffa609edec8052c315345c34e219a03fa7e]
# 
# patch "packages/initrdscripts/initramfs-uniboot_1.0.bb"
#  from [78c83e65d5b0b78fe7b0e40ddc388dbae7d00c06]
#    to [36899b0b286458882b6c7dc82f858b7e130a026e]
#
============================================================
--- packages/initrdscripts/files/init.sh	f01a2b1d615165dd1f22c6ce448caad76fe2bc21
+++ packages/initrdscripts/files/init.sh	28d18ffa609edec8052c315345c34e219a03fa7e
@@ -41,9 +41,11 @@ load_modules() {
 
 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
 }
 
============================================================
--- packages/initrdscripts/initramfs-uniboot_1.0.bb	78c83e65d5b0b78fe7b0e40ddc388dbae7d00c06
+++ packages/initrdscripts/initramfs-uniboot_1.0.bb	36899b0b286458882b6c7dc82f858b7e130a026e
@@ -1,5 +1,5 @@ SRC_URI = "file://init.sh"
 SRC_URI = "file://init.sh"
-PR = "r8"
+PR = "r9"
 DESCRIPTON = "A modular initramfs init script system."
 RRECOMMENDS = "kernel-module-mtdblock"
 






More information about the Openembedded-commits mailing list