Merge bk://nslu2-linux@nslu2-linux.bkbits.net/unslung-4.x

into builder.(none):/home/dereky/bbroot/unslung-4.x

2005/02/18 23:33:40-10:00 (none)!dyoung
cleaned out some cruft from linuxrc

BKrev: 42170842OmxqWTgI4mccm4il9m0ZaQ

diff --git a/conf/distro/switchbox.conf b/conf/distro/switchbox.conf
index 90c8bae..ff20708 100644 (file)
--- a/conf/distro/switchbox.conf
+++ b/conf/distro/switchbox.conf
@@ -2,7 +2,7 @@
 #@NAME: SwitchBox
 #@DESCRIPTION: SwitchBox Linux Distribution for the NSLU2
 
-TARGET_FPU ?= "soft"
+TARGET_FPU = "soft"
 TARGET_OS = "linux-uclibc"
 
 INHERIT += " package_ipk debian"

diff --git a/packages/busybox/switchbox-1.00/linuxrc b/packages/busybox/switchbox-1.00/linuxrc
index ef97ba1..117bd33 100644 (file)
--- a/packages/busybox/switchbox-1.00/linuxrc
+++ b/packages/busybox/switchbox-1.00/linuxrc
@@ -5,8 +5,7 @@ runboot=
 prefroot=
 
 /bin/mount -t proc proc /proc
-# /bin/echo "5" > /proc/sys/kernel/panic
-# /bin/echo "0x0100" > /proc/sys/kernel/real-root-dev
+/bin/echo "0x0100" > /proc/sys/kernel/real-root-dev
 
 sysconflen=`/bin/dd if=/dev/mtd1 bs=4 count=1 | hexdump -n 6 -e '"%02d"'`
 ipaddr=`/bin/dd if=/dev/mtd1 bs=1 count=$sysconflen skip=4 | grep ip_addr | sed -e s/ip_addr=//`
@@ -150,7 +149,6 @@ if [ -n "$mounted" ] ; then
         sleep 1
         /bin/umount /mnt/jffs2
     fi
-#    /bin/echo "5" > /proc/sys/kernel/panic
     umount /proc
     cd $mounted
     /sbin/pivot_root . initrd
@@ -170,8 +168,6 @@ fi
 if [ -z "$mounted" ] ; then
     /bin/echo "Root filesystem cannot be found - dropping into shell ..."
 
-#    /bin/echo "5" > /proc/sys/kernel/panic
-
     if ( [ "$length" != "FFFFFFFF" ] ); then
        /bin/dd if=$device bs=2 skip=2056 | /bin/tar zxvf -
        /sbin/insmod ixp400