diff options
| author | Rod Whitby <rod@whitby.id.au> | 2005-01-16 08:33:01 +0000 |
|---|---|---|
| committer | Rod Whitby <rod@whitby.id.au> | 2005-01-16 08:33:01 +0000 |
| commit | cd888bf8f5d09d0d79264c8802a4a0998e4ff931 (patch) | |
| tree | a7021d5fcb499cb6ff41a3b49c54b31bade3decb /packages | |
| parent | f6f9de5ff9b4ff36fe43bfcead2a39727143de7d (diff) | |
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
Diffstat (limited to 'packages')
| -rw-r--r-- | packages/busybox/switchbox-1.00/linuxrc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/packages/busybox/switchbox-1.00/linuxrc b/packages/busybox/switchbox-1.00/linuxrc index 82e8c1139b..d4584c8030 100644 --- 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 |