Merge bk://nslu2-linux@nslu2-linux.bkbits.net/openembedded

into home.(none):/home/slug/openembedded

2005/01/16 19:02:38+10:30 (none)!rwhitby
Changed SwitchBox sanity test from -x to -e to allow for OpenSlug's symlinked /sbin/init

BKrev: 41ea26bddzSP8EDjC9Vwt5S7lupNcw

diff --git a/packages/busybox/switchbox-1.00/linuxrc b/packages/busybox/switchbox-1.00/linuxrc
index 82e8c11..d4584c8 100644 (file)
--- a/packages/busybox/switchbox-1.00/linuxrc
+++ b/packages/busybox/switchbox-1.00/linuxrc
@@ -7,7 +7,7 @@ mounted=
 
 if [ -z "$mounted" ] && /bin/mount -rt jffs2 /dev/mtdblock4 /mnt/tmpmnt ; then
 
-    if [ -x /mnt/tmpmnt/sbin/init -o -x /mnt/tmpmnt/bin/init ] ; then
+    if [ -e /mnt/tmpmnt/sbin/init -o -e /mnt/tmpmnt/bin/init ] ; then
        if [ -f /mnt/tmpmnt/.recovery ] ; then
            mounted=
        elif [ -f /mnt/tmpmnt/.ramdisk ] ; then
@@ -48,7 +48,7 @@ fi
 
 if [ -z "$mounted" ] ; then
 
-    if  [ -x /mnt/tmpmnt/sbin/init -o -x /mnt/tmpmnt/bin/init ] ; then
+    if  [ -e /mnt/tmpmnt/sbin/init -o -e /mnt/tmpmnt/bin/init ] ; then
        /bin/echo "Root filesystem will be mounted from /dev/ram0 ..."
        mounted=/mnt/tmpmnt
        /bin/echo "0x0100" > /proc/sys/kernel/real-root-dev