Remove payload dependency for nfsroot, switchbox 4.10

BKrev: 421db5d0cn8KAbFZzi3HfN8ddKIk5w

diff --git a/packages/busybox/switchbox-1.00/linuxrc b/packages/busybox/switchbox-1.00/linuxrc
index d83aed2..18a4440 100644 (file)
--- a/packages/busybox/switchbox-1.00/linuxrc
+++ b/packages/busybox/switchbox-1.00/linuxrc
@@ -109,23 +109,20 @@ if [ -n "$prefroot" ] ; then
 
     if [ $prefroot = "nfsroot" ] ; then
 
-       # Should the network drivers come from payload or the jffs2?
-       if ( [ "$length" != "FFFFFFFF" ] ); then
-           /bin/dd if=$device bs=2 skip=2056 2>/dev/null | /bin/tar zxvf -
-           /sbin/insmod ixp400
-           /sbin/insmod ixp425_eth
-           /sbin/ifconfig ixp0 up $ipaddr netmask $netmask
-           /sbin/route add default gw $gateway
-       fi
-
        /bin/mkdir -p /lib
        /bin/ln -s /mnt/jffs2/lib/* /lib
        /bin/mkdir -p /sbin
        /bin/ln -s /mnt/jffs2/sbin/portmap /sbin
 
+       /sbin/insmod ixp400
+       /sbin/insmod ixp425_eth
+       /sbin/ifconfig ixp0 up $ipaddr netmask $netmask
+       /sbin/route add default gw $gateway
+
        /sbin/ifconfig lo up 127.0.0.1
        /sbin/portmap
 
+       # The nfsrootloc and nfsrootopts vars can be overridden here.
        . /mnt/jffs2/.nfsroot
 
        mount -o $nfsrootopts $nfsrootloc /mnt/newroot

diff --git a/packages/nslu2-binary-only/nslu2-switchbox-firmware.bb b/packages/nslu2-binary-only/nslu2-switchbox-firmware.bb
index f5ddaf8..797775c 100644 (file)
--- 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 = "r17"
+PR = "r18"
 
-SRC_URI = "http://nslu.sf.net/downloads/switchbox-4.9.tar.gz"
+SRC_URI = "http://nslu.sf.net/downloads/switchbox-4.10.tar.gz"
 S = "${WORKDIR}"
 
 python () {