diff options
author | Paul Sokolovsky <pmiscml@gmail.com> | 2008-02-17 02:54:44 +0000 |
---|---|---|
committer | Paul Sokolovsky <pmiscml@gmail.com> | 2008-02-17 02:54:44 +0000 |
commit | d48df38d1f5109cfa951d407ff26dd84155c7ae8 (patch) | |
tree | c401c01d6f2b099baf550c1659965aa7b43447d6 | |
parent | db5d22bd31a498aa24a74e2fec7faa3467fa42ad (diff) |
initramfs-module-block: Accept additional FSTYPE param, handle mount failure.
* FSTYPE useful for FSes not automatically recognized by mount (e.g. jffs2).
-rw-r--r-- | packages/initrdscripts/files/85-blockboot.sh | 6 | ||||
-rw-r--r-- | packages/initrdscripts/initramfs-module-block_1.0.bb | 2 |
2 files changed, 6 insertions, 2 deletions
diff --git a/packages/initrdscripts/files/85-blockboot.sh b/packages/initrdscripts/files/85-blockboot.sh index 567f7e29b3..fee9072d3a 100644 --- a/packages/initrdscripts/files/85-blockboot.sh +++ b/packages/initrdscripts/files/85-blockboot.sh @@ -3,6 +3,10 @@ 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 diff --git a/packages/initrdscripts/initramfs-module-block_1.0.bb b/packages/initrdscripts/initramfs-module-block_1.0.bb index 72812a2490..dcee113dd1 100644 --- a/packages/initrdscripts/initramfs-module-block_1.0.bb +++ b/packages/initrdscripts/initramfs-module-block_1.0.bb @@ -1,5 +1,5 @@ SRC_URI = "file://85-blockboot.sh" -PR = "r1" +PR = "r2" RDEPENDS = "initramfs-uniboot" DESCRIPTION = "An initramfs module for booting off normal block devices." |