[oe-commits] org.oe.dev initramfs-uniboot: Modprobe mtdblock and factor out fatal().

[pfalcon commit]

initramfs-uniboot: Modprobe mtdblock and factor out fatal().

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

#
# mt diff -r316494a65b32cb4d332cc22c480cf95408c235e2 -r766dada8a567205427a8c1eefb0fbe5923190602
#
# 
# 
# patch "packages/initrdscripts/files/init.sh"
#  from [d6057201f9ee2a9e2d44ed71124d43142bc1a05f]
#    to [7c88f09222ae4b7179e97a10ef8cba495154ad9d]
# 
# patch "packages/initrdscripts/initramfs-uniboot_1.0.bb"
#  from [716f3127ca0421f8c9920adbb82ec03ace9a4717]
#    to [64119766d866f062d27d767f5897b9e1388e7d7e]
# 
============================================================
--- packages/initrdscripts/files/init.sh	d6057201f9ee2a9e2d44ed71124d43142bc1a05f
+++ packages/initrdscripts/files/init.sh	7c88f09222ae4b7179e97a10ef8cba495154ad9d
@@ -8,6 +8,7 @@ early_setup() {
     mkdir /proc
     mount -t proc proc /proc
     mkdir /mnt
+    modprobe -q mtdblock
 }
 
 dev_setup()
@@ -48,13 +49,13 @@ boot_root() {
     exec switch_root -c /dev/console $BOOT_ROOT /sbin/init
 }
 
-boot_failed() {
-    echo "No valid root device was specified.  Please add root=/dev/something to"
-    echo "the kernel command-line and try again."
+fatal() {
+    echo $1
     echo
     exec sh
 }
 
+
 echo "Starting initramfs boot..."
 early_setup
 read_args
@@ -68,4 +69,5 @@ load_modules
 
 load_modules
 [ -n "$BOOT_ROOT" ] && boot_root
+
+fatal "No valid root device was specified.  Please add root=/dev/something to the kernel command-line and try again."
-boot_failed
============================================================
--- packages/initrdscripts/initramfs-uniboot_1.0.bb	716f3127ca0421f8c9920adbb82ec03ace9a4717
+++ packages/initrdscripts/initramfs-uniboot_1.0.bb	64119766d866f062d27d767f5897b9e1388e7d7e
@@ -1,6 +1,7 @@ SRC_URI = "file://init.sh"
 SRC_URI = "file://init.sh"
-PR = "r2"
+PR = "r3"
 DESCRIPTON = "A modular initramfs init script system."
+RRECOMMENDS = "kernel-module-mtdblock"
 
 do_install() {
         install -m 0755 ${WORKDIR}/init.sh ${D}/init