[oe-commits] Andreas Oberritter : initrdscripts: fix sh equality operator

git version control git at git.openembedded.org
Sun Nov 14 23:43:35 UTC 2010


Module: openembedded.git
Branch: master
Commit: f34acbc003cb729c1e04f5e9399063469c338ab0
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=f34acbc003cb729c1e04f5e9399063469c338ab0

Author: Andreas Oberritter <obi at opendreambox.org>
Date:   Tue Oct 26 15:42:56 2010 +0000

initrdscripts: fix sh equality operator

Signed-off-by: Andreas Oberritter <obi at opendreambox.org>
Signed-off-by: Michael Smith <msmith at cbnco.com>

---

 recipes/initrdscripts/files/30-bootmenu.sh         |   14 +++++++-------
 .../initrdscripts/initramfs-module-bootmenu_1.0.bb |    2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/recipes/initrdscripts/files/30-bootmenu.sh b/recipes/initrdscripts/files/30-bootmenu.sh
index 5ebeead..6ce6cb2 100644
--- a/recipes/initrdscripts/files/30-bootmenu.sh
+++ b/recipes/initrdscripts/files/30-bootmenu.sh
@@ -33,7 +33,7 @@ show_menu() {
     cnt=0
     echo -e $list | \
     while read l; do
-        if [ $cnt == $num ]; then
+        if [ $cnt = $num ]; then
 	    echo -e -n "${E}1m" >$CONSOLE
 	fi
         echo -e "$cnt: $l${E}0m" >$CONSOLE
@@ -46,7 +46,7 @@ get_menu_selection()
     cnt=0
     sel=`echo -e $list | \
     while read l; do
-    if [ $cnt == $num ]; then
+    if [ $cnt = $num ]; then
 	    echo $l
 	    break
 	fi
@@ -76,7 +76,7 @@ scan_for_loopimgs()
 
 # Scan all available device/partitions
 while read maj min nblk dev; do
-    if [ -z "$maj" -o "$maj" == "major" ]; then
+    if [ -z "$maj" -o "$maj" = "major" ]; then
 	continue;
     fi
 
@@ -87,7 +87,7 @@ while read maj min nblk dev; do
 	true
     fi
     
-    if [ "$fstype" == "vfat" ]; then
+    if [ "$fstype" = "vfat" ]; then
 	scan_for_loopimgs
 	continue
     fi
@@ -146,7 +146,7 @@ dev=`expr "$sel" : '\([^ /]*\)'`
 path=`expr "$sel" : '[^/]*\([^ ]*\).*'`
 fstype=`expr "$sel" : '[^ ]* *\(.*\)'`
 
-if [ "$dev" == "Shell" ]; then
+if [ "$dev" = "Shell" ]; then
     if [ -x /usr/sbin/dropbear ]; then
 	modprobe g_ether
 	ifconfig usb0 192.168.2.202
@@ -158,7 +158,7 @@ if [ "$dev" == "Shell" ]; then
     fi
 
     exec /bin/sh
-elif [ "$dev" == "NFS" ]; then
+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
@@ -167,7 +167,7 @@ elif [ -n "$path" ]; then
 else
     ROOT_DEVICE="/dev/$dev"
     # jffs2 is not recognized by mount automagically
-    if [ "$fstype" == "(jffs2)" ]; then
+    if [ "$fstype" = "(jffs2)" ]; then
 	ROOT_FSTYPE="jffs2"
     fi
     CMDLINE="$CMDLINE root=$ROOT_DEVICE"
diff --git a/recipes/initrdscripts/initramfs-module-bootmenu_1.0.bb b/recipes/initrdscripts/initramfs-module-bootmenu_1.0.bb
index f662cb4..a370ae9 100644
--- a/recipes/initrdscripts/initramfs-module-bootmenu_1.0.bb
+++ b/recipes/initrdscripts/initramfs-module-bootmenu_1.0.bb
@@ -1,5 +1,5 @@
 SRC_URI = "file://30-bootmenu.sh"
-PR = "r19"
+PR = "r20"
 DESCRIPTION = "An initramfs module with UI for selection of boot device."
 RDEPENDS_${PN} = "klibc-static-utils-fstype initramfs-uniboot initramfs-module-block initramfs-module-loop initramfs-module-nfs"
 # For VFAT mounting.





More information about the Openembedded-commits mailing list