diff options
Diffstat (limited to 'busybox')
| -rw-r--r-- | busybox/busybox-1.00/openslug/defconfig | 0 | ||||
| -rw-r--r-- | busybox/switchbox-1.00/linuxrc | 36 | ||||
| -rw-r--r-- | busybox/switchbox_1.00.oe | 2 |
3 files changed, 3 insertions, 35 deletions
diff --git a/busybox/busybox-1.00/openslug/defconfig b/busybox/busybox-1.00/openslug/defconfig new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/busybox/busybox-1.00/openslug/defconfig diff --git a/busybox/switchbox-1.00/linuxrc b/busybox/switchbox-1.00/linuxrc index 70ad6855b6..858bac7258 100644 --- a/busybox/switchbox-1.00/linuxrc +++ b/busybox/switchbox-1.00/linuxrc @@ -5,36 +5,6 @@ mounted= /bin/mount -t proc proc /proc /bin/echo "0x0100" > /proc/sys/kernel/real-root-dev -/bin/sleep 10 - -if [ -z "$mounted" ] && /bin/mount -rt ext3 /dev/sda2 /mnt/tmpmnt ; then - - if [ -x /mnt/tmpmnt/bin/init ] && - [ -d /mnt/tmpmnt/unslung ] && [ -r /mnt/tmpmnt/.unslung ] ; then - /bin/echo "Root filesystem will be mounted from /dev/sda2 ..." - /bin/echo "Firmware Version: `/bin/cat /mnt/tmpmnt/.unslung`" - mounted=/mnt/tmpmnt - /bin/echo "0x0802" > /proc/sys/kernel/real-root-dev - [ -r $mounted/unslung/rc.linuxrc ] && . $mounted/unslung/rc.linuxrc - fi - - /bin/umount /mnt/tmpmnt -fi - -if [ -z "$mounted" ] && /bin/mount -rt ext3 /dev/sdb2 /mnt/tmpmnt ; then - - if [ -x /mnt/tmpmnt/bin/init ] && - [ -d /mnt/tmpmnt/unslung ] && [ -r /mnt/tmpmnt/.unslung ] ; then - /bin/echo "Root filesystem will be mounted from /dev/sdb2 ..." - /bin/echo "Firmware Version: `/bin/cat /mnt/tmpmnt/.unslung`" - mounted=/mnt/tmpmnt - /bin/echo "0x0812" > /proc/sys/kernel/real-root-dev - [ -r $mounted/unslung/rc.linuxrc ] && . $mounted/unslung/rc.linuxrc - fi - - /bin/umount /mnt/tmpmnt -fi - 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 @@ -47,13 +17,11 @@ if [ -z "$mounted" ] && /bin/mount -rt jffs2 /dev/mtdblock4 /mnt/tmpmnt ; then fi if [ -z "$mounted" ] ; then - if [ -x /mnt/tmpmnt/bin/init ] && - [ -d /mnt/tmpmnt/unslung ] && [ -r /mnt/tmpmnt/.unslung ] ; then + + if [ -x /mnt/tmpmnt/sbin/init -o -x /mnt/tmpmnt/bin/init ] ; then /bin/echo "Root filesystem will be mounted from /dev/ram0 ..." - /bin/echo "Firmware Version: `/bin/cat /.unslung`" mounted=/mnt/tmpmnt /bin/echo "0x0100" > /proc/sys/kernel/real-root-dev - [ -r $mounted/unslung/rc.linuxrc ] && . $mounted/unslung/rc.linuxrc fi fi diff --git a/busybox/switchbox_1.00.oe b/busybox/switchbox_1.00.oe index 2536e46eef..42b82d8a9d 100644 --- a/busybox/switchbox_1.00.oe +++ b/busybox/switchbox_1.00.oe @@ -5,7 +5,7 @@ HOMEPAGE = "http://www.busybox.net" LICENSE = "GPL" SECTION = "base" PRIORITY = "required" -PR = "r1" +PR = "r2" SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.gz \ file://defconfig \ |