initramfs-uniboot: FSTYPE -> ROOT_FSTYPE, set from rootfstype= command line param.

diff --git a/packages/initrdscripts/files/30-bootmenu.sh b/packages/initrdscripts/files/30-bootmenu.sh
index a45b55a353c6b66481196174c747b4c5286c833f..3f3b8c70792175947f82408450786f88bac0d5b1 100644 (file)
--- 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 fee9072d3a61efd17969192481c99c2218ba66e4..e1c3ed893e0b190d76c857f89046f33217b53aee 100644 (file)
--- 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 08163fa04027332a40c7d551e19c6eabc28ac88b..8b9fe124292bc5ccf6c69526f86ad5ca370ada60 100644 (file)
--- 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 dcee113dd1a8bebf2adde98561c714e589596c7d..b4b2d4315068baa87f466de4b13ce851e7be7ddd 100644 (file)
--- 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 6f3c6ec5653048a3aed1c7fbb7e0062558121ab0..8c66521f30608a93b1f31b80a7a5f124b0009b1f 100644 (file)
--- 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 786afb972cd6818affdaee432c1628cba85706cf..e0f726582e7f2038f8f6a780178ab60b52f5ecbd 100644 (file)
--- 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"