[oe-commits] org.oe.dev * initramfs-module-bootmenu: Add support for jffs2 booting and "drop to shell" option.

[pfalcon commit]

* initramfs-module-bootmenu: Add support for jffs2 booting and "drop to shell" option.

Author: pfalcon at openembedded.org
Branch: org.openembedded.dev
Revision: f6ab5be390e4400fb993f0e449049b62daece68e
ViewMTN: http://monotone.openembedded.org/revision/info/f6ab5be390e4400fb993f0e449049b62daece68e
Files:
1
packages/initrdscripts/files/10-initfs.sh
packages/initrdscripts/files/30-bootmenu.sh
packages/initrdscripts/initramfs-module-bootmenu_1.0.bb
packages/initrdscripts/initramfs-module-initfs_1.0.bb
Diffs:

#
# mt diff -r461df56d5cc4fa62e620c9efe56f3253258ee0f5 -rf6ab5be390e4400fb993f0e449049b62daece68e
#
# 
# 
# patch "packages/initrdscripts/files/10-initfs.sh"
#  from [31e75b6e96fa83b4f7cf734dd5852b1f4aab02e9]
#    to [5f0d6f2403263afd21f7a7a0b34c979666f7a4ef]
# 
# patch "packages/initrdscripts/files/30-bootmenu.sh"
#  from [fa8ea4dd925ccbd5bbc48f509c2c02ba47bc73e8]
#    to [8bb8113fc468d470541b576af88eb4a02493531e]
# 
# patch "packages/initrdscripts/initramfs-module-bootmenu_1.0.bb"
#  from [f13252f06b1023c948e8295f3ee95c0eda773899]
#    to [29437c7f767ebb2d1a52b0acf24d71da5b298909]
# 
# patch "packages/initrdscripts/initramfs-module-initfs_1.0.bb"
#  from [e8b2ca5b6f8808155c08371d32e7b42f94caa7bb]
#    to [71d1fee98407e78577c2537c60488436d5a31c88]
# 
============================================================
--- packages/initrdscripts/files/10-initfs.sh	31e75b6e96fa83b4f7cf734dd5852b1f4aab02e9
+++ packages/initrdscripts/files/10-initfs.sh	5f0d6f2403263afd21f7a7a0b34c979666f7a4ef
@@ -1,5 +1,6 @@ modprobe -q ext3 >/dev/null 2>&1
 #!/bin/sh
 
 modprobe -q vfat >/dev/null 2>&1
 modprobe -q ext2 >/dev/null 2>&1
 modprobe -q ext3 >/dev/null 2>&1
+modprobe -q jffs2 >/dev/null 2>&1
============================================================
--- packages/initrdscripts/files/30-bootmenu.sh	fa8ea4dd925ccbd5bbc48f509c2c02ba47bc73e8
+++ packages/initrdscripts/files/30-bootmenu.sh	8bb8113fc468d470541b576af88eb4a02493531e
@@ -95,6 +95,7 @@ add_menu_item "NFS (nfsroot=192.168.2.20
 done < /proc/partitions
 
 add_menu_item "NFS (nfsroot=192.168.2.200:/srv/nfs/oe/image)"
+add_menu_item "Shell"
 
 total=`echo -e $list | wc -l`
 num=0
@@ -142,8 +143,11 @@ path=`expr "$sel" : '[^/]*\([^ ]*\).*'`
 
 dev=`expr "$sel" : '\([^ /]*\)'`
 path=`expr "$sel" : '[^/]*\([^ ]*\).*'`
+fstype=`expr "$sel" : '[^ ]* *\(.*\)'`
 
-if [ "$dev" == "NFS" ]; then
+if [ "$dev" == "Shell" ]; then
+    exec /bin/sh
+elif [ "$dev" == "NFS" ]; then
     ROOT_DEVICE="/dev/nfs"
     CMDLINE="$CMDLINE root=/dev/nfs nfsroot=192.168.2.200:/srv/nfs/oe/image"
 elif [ -n "$path" ]; then
@@ -151,6 +155,10 @@ else
     CMDLINE="$CMDLINE root=/dev/loop looproot=/dev/$dev:$path"
 else
     ROOT_DEVICE="/dev/$dev"
+    # jffs2 is not recognized by mount automagically
+    if [ "$fstype" == "(jffs2)" ]; then
+	FSTYPE="jffs2"
+    fi
     CMDLINE="$CMDLINE root=$ROOT_DEVICE"
 fi
 
============================================================
--- packages/initrdscripts/initramfs-module-bootmenu_1.0.bb	f13252f06b1023c948e8295f3ee95c0eda773899
+++ packages/initrdscripts/initramfs-module-bootmenu_1.0.bb	29437c7f767ebb2d1a52b0acf24d71da5b298909
@@ -1,5 +1,5 @@ SRC_URI = "file://30-bootmenu.sh"
 SRC_URI = "file://30-bootmenu.sh"
-PR = "r9"
+PR = "r10"
 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-module-initfs_1.0.bb	e8b2ca5b6f8808155c08371d32e7b42f94caa7bb
+++ packages/initrdscripts/initramfs-module-initfs_1.0.bb	71d1fee98407e78577c2537c60488436d5a31c88
@@ -1,5 +1,5 @@ SRC_URI = "file://10-initfs.sh"
 SRC_URI = "file://10-initfs.sh"
-PR = "r2"
+PR = "r4"
 DESCRIPTION = "An initramfs module for initializing filesystems."
 RDEPENDS = "initramfs-uniboot"
 RRECOMMENDS = "kernel-module-vfat kernel-module-ext2"