diff options
| author | Sergey Lapin <slapinid@gmail.com> | 2008-03-03 11:19:39 +0000 |
|---|---|---|
| committer | Sergey Lapin <slapinid@gmail.com> | 2008-03-03 11:19:39 +0000 |
| commit | 07c0de10dddece15b5a88e76ec94a9abc985b9cd (patch) | |
| tree | 340de59696786aaa35070e7615700bf0bb491833 /packages/initrdscripts/files/30-bootmenu.sh | |
| parent | fd03b5166557844135feef144c2d78470f71f7e6 (diff) | |
| parent | 34c6339ee471446c0231675f9fc83d4a419d53c3 (diff) | |
merge of '6bfc098b36170550230dc57120c75b31480dc6b3'
and 'abcca41fb7edac5318b0cb0266d5f0c167f87c2f'
Diffstat (limited to 'packages/initrdscripts/files/30-bootmenu.sh')
| -rw-r--r-- | packages/initrdscripts/files/30-bootmenu.sh | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/packages/initrdscripts/files/30-bootmenu.sh b/packages/initrdscripts/files/30-bootmenu.sh index 7bc1429b1b..3f3b8c7079 100644 --- a/packages/initrdscripts/files/30-bootmenu.sh +++ b/packages/initrdscripts/files/30-bootmenu.sh @@ -95,6 +95,7 @@ while read maj min nblk dev; do 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,15 +143,23 @@ echo Selected: $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 nfsroot=192.168.2.200:/srv/nfs/oe/image" + CMDLINE="$CMDLINE root=/dev/nfs nfsroot=192.168.2.200:/srv/nfs/oe/image" elif [ -n "$path" ]; then ROOT_DEVICE="/dev/loop" - CMDLINE="looproot=/dev/$dev:$path" + 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 + ROOT_FSTYPE="jffs2" + fi + CMDLINE="$CMDLINE root=$ROOT_DEVICE" fi echo ROOT_DEVICE=$ROOT_DEVICE |