[oe-commits] org.oe.dev initramfs-module-block: Accept additional FSTYPE param, handle mount failure.

[pfalcon commit]

initramfs-module-block: Accept additional FSTYPE param, handle mount failure.
* FSTYPE useful for FSes not automatically recognized by mount (e.g. jffs2).

Author: pfalcon at openembedded.org
Branch: org.openembedded.dev
Revision: 461df56d5cc4fa62e620c9efe56f3253258ee0f5
ViewMTN: http://monotone.openembedded.org/revision/info/461df56d5cc4fa62e620c9efe56f3253258ee0f5
Files:
1
packages/initrdscripts/files/85-blockboot.sh
packages/initrdscripts/initramfs-module-block_1.0.bb
Diffs:

#
# mt diff -r766dada8a567205427a8c1eefb0fbe5923190602 -r461df56d5cc4fa62e620c9efe56f3253258ee0f5
#
# 
# 
# patch "packages/initrdscripts/files/85-blockboot.sh"
#  from [e1e0ab71a19561305b6a02ff169c7e789c5359ae]
#    to [fcd4bc3bceb922994a440019282e5e4eeb71dd62]
# 
# patch "packages/initrdscripts/initramfs-module-block_1.0.bb"
#  from [1d63081f1074144e693737bd6ca954bd64c1b1a2]
#    to [c517f5068701b22da3aaea6340522743f8d05d9e]
# 
============================================================
--- packages/initrdscripts/files/85-blockboot.sh	e1e0ab71a19561305b6a02ff169c7e789c5359ae
+++ packages/initrdscripts/files/85-blockboot.sh	fcd4bc3bceb922994a440019282e5e4eeb71dd62
@@ -1,8 +1,12 @@ if [ -e "$ROOT_DEVICE" ]; then
 #!/bin/sh
 # Allow booting from a normal block device.
 
 if [ -e "$ROOT_DEVICE" ]; then
     echo "booting from: $ROOT_DEVICE"
-    mount "$ROOT_DEVICE" /mnt
+    type=""
+    if [ -n "$FSTYPE" ]; then
+	type="-t $FSTYPE"
+    fi
+    mount $type "$ROOT_DEVICE" /mnt || fatal "Unable to mount rootfs device"
     BOOT_ROOT=/mnt
 fi
============================================================
--- packages/initrdscripts/initramfs-module-block_1.0.bb	1d63081f1074144e693737bd6ca954bd64c1b1a2
+++ packages/initrdscripts/initramfs-module-block_1.0.bb	c517f5068701b22da3aaea6340522743f8d05d9e
@@ -1,5 +1,5 @@ SRC_URI = "file://85-blockboot.sh"
 SRC_URI = "file://85-blockboot.sh"
-PR = "r1"
+PR = "r2"
 RDEPENDS = "initramfs-uniboot"
 DESCRIPTION = "An initramfs module for booting off normal block devices."