merge of '9125a7fc883765cf996f50cc6e2ffa98a2c08e40'

     and 'bfa62d5baf96a6142cf2f6eb0833399d79630633'

6 files changed, 8 insertions, 6 deletions

diff --git a/packages/initrdscripts/files/30-bootmenu.sh b/packages/initrdscripts/files/30-bootmenu.sh
index a45b55a353..3f3b8c7079 100644
--- a/packages/initrdscripts/files/30-bootmenu.sh
+++ b/packages/initrdscripts/files/30-bootmenu.sh
@@ -157,7 +157,7 @@ else
     ROOT_DEVICE="/dev/$dev"
     # jffs2 is not recognized by mount automagically
     if [ "$fstype" == "(jffs2)" ]; then
-	FSTYPE="jffs2"
+	ROOT_FSTYPE="jffs2"
     fi
     CMDLINE="$CMDLINE root=$ROOT_DEVICE"
 fi
diff --git a/packages/initrdscripts/files/85-blockboot.sh b/packages/initrdscripts/files/85-blockboot.sh
index fee9072d3a..e1c3ed893e 100644
--- a/packages/initrdscripts/files/85-blockboot.sh
+++ b/packages/initrdscripts/files/85-blockboot.sh
@@ -4,8 +4,8 @@
 if [ -e "$ROOT_DEVICE" ]; then
     echo "booting from: $ROOT_DEVICE"
     type=""
-    if [ -n "$FSTYPE" ]; then
-	type="-t $FSTYPE"
+    if [ -n "$ROOT_FSTYPE" ]; then
+	type="-t $ROOT_FSTYPE"
     fi
     mount $type "$ROOT_DEVICE" /mnt || fatal "Unable to mount rootfs device"
     BOOT_ROOT=/mnt
diff --git a/packages/initrdscripts/files/init.sh b/packages/initrdscripts/files/init.sh
index 08163fa040..8b9fe12429 100644
--- a/packages/initrdscripts/files/init.sh
+++ b/packages/initrdscripts/files/init.sh
@@ -31,6 +31,8 @@ read_args() {
         case $arg in
             root=*)
                 ROOT_DEVICE=$optarg ;;
+            rootfstype=*)
+                ROOT_FSTYPE=$optarg ;;
             rootdelay=*)
                 rootdelay=$optarg ;;
         esac
diff --git a/packages/initrdscripts/initramfs-module-block_1.0.bb b/packages/initrdscripts/initramfs-module-block_1.0.bb
index dcee113dd1..b4b2d43150 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 = "r2"
+PR = "r3"
 RDEPENDS = "initramfs-uniboot"
 DESCRIPTION = "An initramfs module for booting off normal block devices."
 
diff --git a/packages/initrdscripts/initramfs-module-bootmenu_1.0.bb b/packages/initrdscripts/initramfs-module-bootmenu_1.0.bb
index 6f3c6ec565..8c66521f30 100644
--- a/packages/initrdscripts/initramfs-module-bootmenu_1.0.bb
+++ b/packages/initrdscripts/initramfs-module-bootmenu_1.0.bb
@@ -1,5 +1,5 @@
 SRC_URI = "file://30-bootmenu.sh"
-PR = "r10"
+PR = "r11"
 DESCRIPTION = "An initramfs module with UI for selection of boot device."
 RDEPENDS = "klibc-utils-fstype initramfs-uniboot initramfs-module-block initramfs-module-loop initramfs-module-nfs"
 # For VFAT mounting.
diff --git a/packages/initrdscripts/initramfs-uniboot_1.0.bb b/packages/initrdscripts/initramfs-uniboot_1.0.bb
index 786afb972c..e0f726582e 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 = "r3"
+PR = "r4"
 DESCRIPTON = "A modular initramfs init script system."
 RRECOMMENDS = "kernel-module-mtdblock"