diff options
| author | Rod Whitby <rod@whitby.id.au> | 2004-11-17 13:11:20 +0000 |
|---|---|---|
| committer | Rod Whitby <rod@whitby.id.au> | 2004-11-17 13:11:20 +0000 |
| commit | e66977412765ccc7486d63f99f63da35830de9a3 (patch) | |
| tree | fe45b346507826e878e9e096a0be4c387262d83c /busybox | |
| parent | 974871cd9d31ea283966c95954cfb34956d38800 (diff) | |
Merge bk://nslu2-linux@nslu2-linux.bkbits.net/packages
into home.(none):/home/openembedded/packages
2004/11/17 23:40:41+10:30 (none)!rwhitby
Reduced size of switchbox ramdisk to 1MB, and made the /linuxrc test for either /sbin/init or /bin/init to find a bootable jffs2 image.
BKrev: 419b4df8LXF_YsbCtpTCfDToaeGsig
Diffstat (limited to 'busybox')
| -rw-r--r-- | busybox/switchbox-1.00/linuxrc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/busybox/switchbox-1.00/linuxrc b/busybox/switchbox-1.00/linuxrc index 1368b418a7..70ad6855b6 100644 --- a/busybox/switchbox-1.00/linuxrc +++ b/busybox/switchbox-1.00/linuxrc @@ -37,7 +37,7 @@ fi if [ -z "$mounted" ] && /bin/mount -rt jffs2 /dev/mtdblock4 /mnt/tmpmnt ; then - if [ -x /mnt/tmpmnt/bin/init ] ; then + if [ -x /mnt/tmpmnt/sbin/init -o -x /mnt/tmpmnt/bin/init ] ; then /bin/echo "Root filesystem will be mounted from /dev/mtdblock4 ..." mounted=/mnt/tmpmnt /bin/echo "0x1f04" > /proc/sys/kernel/real-root-dev |