summaryrefslogtreecommitdiff
path: root/packages/busybox
diff options
context:
space:
mode:
authorg2@giantshoulder.com <g2@giantshoulder.com>2005-01-18 16:31:15 +0000
committerg2@giantshoulder.com <g2@giantshoulder.com>2005-01-18 16:31:15 +0000
commite37195af4083ffd12f0f2071ef2f80c0bb7b4e1b (patch)
treec0fcf5aaacb700735983779e43e50f1910273407 /packages/busybox
parentb4be67619fccdab84a2e3cd6158c75cb38ab0524 (diff)
Merge nslu2-linux@nslu2-linux.bkbits.net:openembedded
into giantshoulder.com:/home/tom/dev/openslug/openembedded 2005/01/18 10:37:25-05:00 giantshoulder.com!g2 OpenSlug/Switchbox fixes for OpenSlug boot BKrev: 41ed39d3t5lp5aNUWTjb6AWRB_HSww
Diffstat (limited to 'packages/busybox')
-rw-r--r--packages/busybox/switchbox-1.00/linuxrc2
-rw-r--r--packages/busybox/switchbox_1.00.bb2
2 files changed, 2 insertions, 2 deletions
diff --git a/packages/busybox/switchbox-1.00/linuxrc b/packages/busybox/switchbox-1.00/linuxrc
index d4584c8030..cd49b16ccf 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 [ -e /mnt/tmpmnt/sbin/init -o -e /mnt/tmpmnt/bin/init ] ; then
+ if [ -x /mnt/tmpmnt/sbin/init -o -L /mnt/tmpmnt/sbin/init -o -x /mnt/tmpmnt/bin/init -o -L /mnt/tmpmnt/bin/init ] ; then
if [ -f /mnt/tmpmnt/.recovery ] ; then
mounted=
elif [ -f /mnt/tmpmnt/.ramdisk ] ; then
diff --git a/packages/busybox/switchbox_1.00.bb b/packages/busybox/switchbox_1.00.bb
index 6367688d17..3e86966411 100644
--- a/packages/busybox/switchbox_1.00.bb
+++ b/packages/busybox/switchbox_1.00.bb
@@ -4,7 +4,7 @@ HOMEPAGE = "http://www.busybox.net"
LICENSE = "GPL"
SECTION = "base"
PRIORITY = "required"
-PR = "r5"
+PR = "r6"
SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.gz \
file://defconfig \