summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--conf/distro/switchbox.conf2
-rw-r--r--conf/machine/nslu2.conf3
-rw-r--r--packages/busybox/switchbox-1.00/linuxrc45
-rw-r--r--packages/busybox/switchbox_1.00.bb2
-rw-r--r--packages/meta/openslug-image.bb3
-rw-r--r--packages/nslu2-binary-only/nslu2-switchbox-firmware.bb4
-rw-r--r--packages/openslug-init/openslug-init_0.10.bb4
7 files changed, 35 insertions, 28 deletions
diff --git a/conf/distro/switchbox.conf b/conf/distro/switchbox.conf
index c3013cf858..6cde69946b 100644
--- a/conf/distro/switchbox.conf
+++ b/conf/distro/switchbox.conf
@@ -12,6 +12,6 @@ IMAGE_ROOTFS_SIZE_ext2 = "1024"
IMAGE_ROOTFS_SIZE_ext2.gz = "1024"
SWITCHBOX_DEVICE_TABLE = "${@bb.which(bb.data.getVar('BBPATH', d, 1), 'files/device_table-unslung.txt')}"
-EXTRA_IMAGECMD_ext2.gz = "-r 0 -i 512 -f ${SWITCHBOX_DEVICE_TABLE}"
+EXTRA_IMAGECMD_ext2.gz = "-r 0 -i 512 -D ${SWITCHBOX_DEVICE_TABLE}"
USE_NLS = "no"
diff --git a/conf/machine/nslu2.conf b/conf/machine/nslu2.conf
index dc2b08f4fe..9fe31196f5 100644
--- a/conf/machine/nslu2.conf
+++ b/conf/machine/nslu2.conf
@@ -19,4 +19,5 @@ CVSDATE_gnu-config-native ?= "20050221"
CVSDATE_ipkg-utils-native ?= "20050221"
CVSDATE_ipkg-link ?= "20050221"
CVSDATE_uclibc ?= "20050221"
-CVSDATE_genext2fs ?= "20050221" \ No newline at end of file
+CVSDATE_genext2fs ?= "20050221"
+CVSDATE_genext2fs-native ?= "20050221" \ No newline at end of file
diff --git a/packages/busybox/switchbox-1.00/linuxrc b/packages/busybox/switchbox-1.00/linuxrc
index da500300c3..d83aed2180 100644
--- a/packages/busybox/switchbox-1.00/linuxrc
+++ b/packages/busybox/switchbox-1.00/linuxrc
@@ -64,11 +64,15 @@ if [ -n "$prefroot" ] ; then
-L /mnt/newroot/bin/init -o -x /mnt/newroot/bin/init ] ; then
/bin/echo "Root filesystem will be mounted from /dev/$prefroot ..."
else
- /bin/echo "Cant find valid rootfs on /dev/$prefroot, using recovery ..."
- mounted=
+ /bin/umount /mnt/newroot
+ /bin/echo "Cant find valid rootfs on /dev/$prefroot, using jffs2 ..."
+ mounted=/mnt/jffs2
+ prefroot=jffs2
fi
- elif [ $prefroot = "maintenence" ] ; then
+ fi
+
+ if [ $prefroot = "maintenence" ] ; then
/bin/dd if=/dev/zero of=/dev/ram1 bs=1k count=12k 2>/dev/null
/bin/mkdir /lib
/bin/ln -s /mnt/jffs2/lib/* /lib
@@ -79,7 +83,7 @@ if [ -n "$prefroot" ] ; then
/usr/bin/mke2fs -m 0 /dev/ram1 12288
/bin/mount -t ext2 /dev/ram1 /mnt/newroot
( cd /mnt/jffs2 ; /usr/bin/find . -print0 -mount | /usr/bin/cpio -p -0 -d -m -u /mnt/newroot )
- if [ -x /mnt/newroot/bin/init ] && [ -r /mnt/newroot/.unslung ] ; then
+ if [ -r /mnt/newroot/.unslung ] ; then
/bin/cp /mnt/newroot/home/httpd/html/Management/upgrade.cgi /mnt/newroot/home/httpd/html/Management/upgrade-real.cgi
/bin/echo "#!/bin/sh" > /mnt/newroot/home/httpd/html/Management/upgrade.cgi
/bin/echo >> /mnt/newroot/home/httpd/html/Management/upgrade.cgi
@@ -92,12 +96,18 @@ if [ -n "$prefroot" ] ; then
/bin/echo "exec /home/httpd/html/Management/upgrade-real.cgi" \
>> /mnt/newroot/home/httpd/html/Management/upgrade.cgi
/bin/echo "Root filesystem will be mounted from /dev/ram1 (a copy of /dev/mtdblock4) ..."
+ elif [ -r /mnt/newroot/.openslug ] ; then
+ /bin/echo "Root filesystem will be mounted from /dev/ram1 (a copy of /dev/mtdblock4) ..."
else
- /bin/echo "Cant find valid rootfs on ram1, using recovery ..."
+ /bin/umount /mnt/newroot
+ /bin/echo "Cant find valid rootfs on /dev/ram1, using recovery ..."
mounted=
+ prefroot=
fi
- elif [ $prefroot = "nfsroot" ] ; then
+ fi
+
+ if [ $prefroot = "nfsroot" ] ; then
# Should the network drivers come from payload or the jffs2?
if ( [ "$length" != "FFFFFFFF" ] ); then
@@ -125,11 +135,15 @@ if [ -n "$prefroot" ] ; then
/bin/echo "Root filesystem will be mounted from a NFS root ..."
mounted=/mnt/newroot
else
- /bin/echo "Cant find valid NFS rootfs, using recovery ..."
- mounted=
+ /bin/umount /mnt/newroot
+ /bin/echo "Cant find valid NFS rootfs, using jffs2 ..."
+ mounted=/mnt/jffs2
+ prefroot=jffs2
fi
- else
+ fi
+
+ if [ $prefroot = "jffs2" ] ; then
if [ -L /mnt/jffs2/sbin/init -o -x /mnt/jffs2/sbin/init -o \
-L /mnt/jffs2/bin/init -o -x /mnt/jffs2/bin/init ] ; then
/bin/echo "Root filesystem will be mounted from /dev/mtdblock4 ..."
@@ -165,21 +179,10 @@ if [ -n "$mounted" ] ; then
exec /usr/sbin/chroot . $runboot < dev/console > dev/console 2>&1
fi
-#if [ -z "$mounted" ] ; then
-#
-# /bin/umount /mnt/jffs2
-# if [ -L /mnt/jffs2/sbin/init -o -x /mnt/jffs2/sbin/init -o \
-# -L /mnt/jffs2/bin/init -o -x /mnt/jffs2/bin/init ] ; then
-# /bin/echo "5" > /proc/sys/kernel/panic
-# /bin/echo "Root filesystem will be mounted from /dev/ram0 ..."
-# /bin/echo "0x0100" > /proc/sys/kernel/real-root-dev
-# fi
-#fi
-
if [ -z "$mounted" ] ; then
/bin/echo "Root filesystem cannot be found - dropping into shell ..."
- if ( [ "$length" != "FFFFFFFF" ] ); then
+ if ( [ -x /sbin/telnetd -a "$length" != "FFFFFFFF" ] ); then
/bin/dd if=$device bs=2 skip=2056 2>/dev/null | /bin/tar zxvf -
/sbin/insmod ixp400
/sbin/insmod ixp425_eth
diff --git a/packages/busybox/switchbox_1.00.bb b/packages/busybox/switchbox_1.00.bb
index c8d3ff5933..7ddecf8738 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 = "r9"
+PR = "r10"
SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.gz \
file://defconfig \
diff --git a/packages/meta/openslug-image.bb b/packages/meta/openslug-image.bb
index 3324f20574..4a9fa19163 100644
--- a/packages/meta/openslug-image.bb
+++ b/packages/meta/openslug-image.bb
@@ -13,6 +13,7 @@ DEPENDS = "base-files base-passwd-3.5.7 \
sysvinit tinylogin lrzsz portmap \
ixp4xx-csr ixp425-eth openslug-init \
ipkg-collateral ipkg ipkg-link \
+ cpio findutils e2fsprogs \
${OPENSLUG_EXTRA_DEPENDS}"
IPKG_INSTALL = "base-files base-passwd \
@@ -20,6 +21,8 @@ IPKG_INSTALL = "base-files base-passwd \
update-modules sysvinit tinylogin lrzsz portmap \
ixp4xx-csr ixp425-eth openslug-init \
ipkg-collateral ipkg ipkg-link \
+ cpio findutils e2fsprogs-mke2fs \
+ e2fsprogs-fsck e2fsprogs-e2fsck \
${OPENSLUG_EXTRA_INSTALL}"
inherit image_ipk
diff --git a/packages/nslu2-binary-only/nslu2-switchbox-firmware.bb b/packages/nslu2-binary-only/nslu2-switchbox-firmware.bb
index 9778896c04..f5ddaf8413 100644
--- a/packages/nslu2-binary-only/nslu2-switchbox-firmware.bb
+++ b/packages/nslu2-binary-only/nslu2-switchbox-firmware.bb
@@ -2,9 +2,9 @@ SECTION = "base"
DEPENDS = ""
PACKAGES = ""
INHIBIT_DEFAULT_DEPS = "1"
-PR = "r16"
+PR = "r17"
-SRC_URI = "http://nslu.sf.net/downloads/switchbox-4.8.tar.gz"
+SRC_URI = "http://nslu.sf.net/downloads/switchbox-4.9.tar.gz"
S = "${WORKDIR}"
python () {
diff --git a/packages/openslug-init/openslug-init_0.10.bb b/packages/openslug-init/openslug-init_0.10.bb
index 541829ac55..ae801e182f 100644
--- a/packages/openslug-init/openslug-init_0.10.bb
+++ b/packages/openslug-init/openslug-init_0.10.bb
@@ -2,9 +2,9 @@ DESCRIPTION = "Openslug initial network config via sysconf"
SECTION = "console/network"
LICENSE = "GPL"
DEPENDS = "base-files"
-PR = "r7"
+PR = "r8"
-OPENSLUG_VERSION = "1.2-alpha"
+OPENSLUG_VERSION = "1.3-alpha"
SRC_URI = "file://sysconfsetup \
file://modutils.txt \
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-11 13:25:16 +0000