[oe-commits] org.oe.dev initramfs-uniboot: FSTYPE -> ROOT_FSTYPE, set from rootfstype= command line param.

[pfalcon commit]

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

Author: pfalcon at openembedded.org
Branch: org.openembedded.dev
Revision: bfa62d5baf96a6142cf2f6eb0833399d79630633
ViewMTN: http://monotone.openembedded.org/revision/info/bfa62d5baf96a6142cf2f6eb0833399d79630633
Files:
1
packages/initrdscripts/files/30-bootmenu.sh
packages/initrdscripts/files/85-blockboot.sh
packages/initrdscripts/files/init.sh
packages/initrdscripts/initramfs-module-block_1.0.bb
packages/initrdscripts/initramfs-module-bootmenu_1.0.bb
packages/initrdscripts/initramfs-uniboot_1.0.bb
Diffs:

#
# mt diff -rf6ab5be390e4400fb993f0e449049b62daece68e -rbfa62d5baf96a6142cf2f6eb0833399d79630633
#
# 
# 
# patch "packages/initrdscripts/files/30-bootmenu.sh"
#  from [8bb8113fc468d470541b576af88eb4a02493531e]
#    to [b378e73bcd2daa97bd9e9134000a2ade7fe2538f]
# 
# patch "packages/initrdscripts/files/85-blockboot.sh"
#  from [fcd4bc3bceb922994a440019282e5e4eeb71dd62]
#    to [e0ae45c3c5c308f37255fd249ea75bdacb3d5f67]
# 
# patch "packages/initrdscripts/files/init.sh"
#  from [7c88f09222ae4b7179e97a10ef8cba495154ad9d]
#    to [96fb4bc0a57019aa64a5b8316e5868a507195f87]
# 
# patch "packages/initrdscripts/initramfs-module-block_1.0.bb"
#  from [c517f5068701b22da3aaea6340522743f8d05d9e]
#    to [7ce2aaa3caaaea18e4f89c97ac9fda1e79b2f1a4]
# 
# patch "packages/initrdscripts/initramfs-module-bootmenu_1.0.bb"
#  from [29437c7f767ebb2d1a52b0acf24d71da5b298909]
#    to [ed86798f2ad4cb2713e525c7939d02a161e7465a]
# 
# patch "packages/initrdscripts/initramfs-uniboot_1.0.bb"
#  from [64119766d866f062d27d767f5897b9e1388e7d7e]
#    to [614ab72976521dc2833ecb9383e5556d18c05fa6]
# 
============================================================
--- packages/initrdscripts/files/30-bootmenu.sh	8bb8113fc468d470541b576af88eb4a02493531e
+++ packages/initrdscripts/files/30-bootmenu.sh	b378e73bcd2daa97bd9e9134000a2ade7fe2538f
@@ -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
============================================================
--- packages/initrdscripts/files/85-blockboot.sh	fcd4bc3bceb922994a440019282e5e4eeb71dd62
+++ packages/initrdscripts/files/85-blockboot.sh	e0ae45c3c5c308f37255fd249ea75bdacb3d5f67
@@ -1,11 +1,11 @@ if [ -e "$ROOT_DEVICE" ]; then
 #!/bin/sh
 # Allow booting from a normal block device.
 
 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
============================================================
--- packages/initrdscripts/files/init.sh	7c88f09222ae4b7179e97a10ef8cba495154ad9d
+++ packages/initrdscripts/files/init.sh	96fb4bc0a57019aa64a5b8316e5868a507195f87
@@ -31,6 +31,8 @@ read_args() {
         case $arg in
             root=*)
                 ROOT_DEVICE=$optarg ;;
+            rootfstype=*)
+                ROOT_FSTYPE=$optarg ;;
             rootdelay=*)
                 rootdelay=$optarg ;;
         esac
============================================================
--- packages/initrdscripts/initramfs-module-block_1.0.bb	c517f5068701b22da3aaea6340522743f8d05d9e
+++ packages/initrdscripts/initramfs-module-block_1.0.bb	7ce2aaa3caaaea18e4f89c97ac9fda1e79b2f1a4
@@ -1,5 +1,5 @@ SRC_URI = "file://85-blockboot.sh"
 SRC_URI = "file://85-blockboot.sh"
-PR = "r2"
+PR = "r3"
 RDEPENDS = "initramfs-uniboot"
 DESCRIPTION = "An initramfs module for booting off normal block devices."
 
============================================================
--- packages/initrdscripts/initramfs-module-bootmenu_1.0.bb	29437c7f767ebb2d1a52b0acf24d71da5b298909
+++ packages/initrdscripts/initramfs-module-bootmenu_1.0.bb	ed86798f2ad4cb2713e525c7939d02a161e7465a
@@ -1,5 +1,5 @@ SRC_URI = "file://30-bootmenu.sh"
 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.
============================================================
--- packages/initrdscripts/initramfs-uniboot_1.0.bb	64119766d866f062d27d767f5897b9e1388e7d7e
+++ packages/initrdscripts/initramfs-uniboot_1.0.bb	614ab72976521dc2833ecb9383e5556d18c05fa6
@@ -1,5 +1,5 @@ SRC_URI = "file://init.sh"
 SRC_URI = "file://init.sh"
-PR = "r3"
+PR = "r4"
 DESCRIPTON = "A modular initramfs init script system."
 RRECOMMENDS = "kernel-module-mtdblock"