Merge bk://nslu2-linux@nslu2-linux.bkbits.net/openembedded

into builds.(none):/home/unslung/firmware/unslung-4.x

2005/02/18 22:02:37+10:30 (none)!rwhitby
Fixed cpio (missing $(DESTDIR) terms).

2005/02/18 02:09:43+10:30 (none)!rwhitby
Merge bk://nslu2-linux@nslu2-linux.bkbits.net/openembedded
into home.(none):/home/slug/unslung-4.x

2005/02/18 01:30:45+10:30 (none)!rwhitby
Merge bk://nslu2-linux@nslu2-linux.bkbits.net/unslung-4.x
into home.(none):/home/slug/unslung-4.x

2005/02/18 01:30:13+10:30 (none)!rwhitby
Added the rw flag to the unslung kernel commandline.

2005/02/17 01:38:30-10:00 (none)!dyoung
Added the stuff to support rw ramdisk and properly pivoting rootfs

2005/02/16 21:08:31-10:00 (none)!dyoung
switchbox.conf:
  fix target_os
linuxrc:
  commented out all panic and real-root-dev bits

2005/02/16 21:06:08-10:00 (none)!dyoung
Merge bk://nslu2-linux@nslu2-linux.bkbits.net/openembedded
into builder.(none):/home/dereky/bbroot/unslung-4.x

2005/02/17 00:07:25+10:30 (none)!rwhitby
Merge bk://nslu2-linux@nslu2-linux.bkbits.net/openembedded
into home.(none):/home/slug/unslung-4.x

2005/02/16 22:51:44+10:30 (none)!rwhitby
Merge

2005/02/16 22:49:40+10:30 (none)!rwhitby
Updated Unslung to 4.1, and converted over to quilt

2005/02/16 01:50:28-10:00 (none)!dyoung
Changed the kernel cmdline

2005/02/05 22:59:14-10:00 (none)!dyoung
Merge

2005/01/24 18:09:34-10:00 (none)!dyoung
Merge bk://nslu2-linux@nslu2-linux.bkbits.net/openembedded
into builder.(none):/home/dereky/bbroot/unslung-4.x

2005/01/22 17:04:46+10:30 (none)!rwhitby
Merge

2005/01/16 19:07:31+10:30 (none)!rwhitby
Changed SwitchBox sanity test from -x to -e to allow for OpenSlug's symlinked /sbin/init

2005/01/07 02:03:52-10:00 (none)!dyoung
Switchbox 4.5 now with proper external disk detection

2005/01/06 01:58:38-10:00 (none)!dyoung
Merge bk://nslu2-linux@nslu2-linux.bkbits.net/openembedded
into builder.(none):/home/dereky/bbroot/unslung-4.x

2005/01/05 21:08:01-10:00 (none)!dyoung
switchbox 4.4

2005/01/05 20:07:16-10:00 (none)!dyoung
Fixed external disk fallback when disk not present

2005/01/05 19:53:50-10:00 (none)!dyoung
preserve initrd for development

2005/01/05 18:45:15-10:00 (none)!dereky
switchbox typofix

2005/01/05 02:16:30-10:00 (none)!dyoung
Switchbox 4.3 .  Dotted .nfsroot per glc suggestion

2005/01/05 02:02:10-10:00 (none)!dyoung
fixed linuxrc... linuxrc != initrd

2005/01/05 00:57:29-10:00 (none)!dyoung
Unslung 4.0

2005/01/04 03:15:25-10:00 (none)!dyoung
change to use switchbox 4.2

2005/01/04 03:01:30-10:00 (none)!dyoung
Merge bk://nslu2-linux@nslu2-linux.bkbits.net/openembedded
into builder.(none):/home/dereky/bbroot/unslung-4.x

2005/01/01 15:41:14-10:00 (none)!dyoung
Merge bk://nslu2-linux@nslu2-linux.bkbits.net/openembedded
into builder.(none):/home/dereky/bbroot/unslung-4.x

2005/01/01 15:20:27-10:00 (none)!dereky
Merge bk://nslu2-linux@nslu2-linux.bkbits.net/openembedded
into builder.(none):/home/dereky/bbroot/unslung-4.x

2004/12/31 19:28:51-10:00 (none)!dyoung
Switchbox 4.2 with fewer typos

2004/12/31 19:10:13-10:00 (none)!dyoung
Switchbox 4.2

2004/12/31 11:36:01-10:00 (none)!dyoung
4.x prelim, internal use only

2004/12/30 18:08:15-10:00 (none)!dereky
Working preliminary version

2004/12/29 02:41:47-10:00 (none)!dyoung
First run NFS stuff

2004/12/28 23:37:18-10:00 (none)!dyoung
change to switchbox 4.1

2004/12/28 23:21:37-10:00 (none)!dereky
Added cut to switchbox

2004/12/28 17:35:28-10:00 (none)!dyoung
adjusted switchbox source version

2004/12/28 16:11:33-10:00 (none)!dyoung
Added creation of /oldroot for pivoting so we dont clobber tmpmnt

2004/12/29 12:48:15+10:30 (none)!rwhitby
Removed initscript stuff from portmap-unslung

2004/12/28 03:13:46-10:00 (none)!dereky
Merge bk://nslu2-linux@nslu2-linux.bkbits.net/unslung-4.x
into builder.(none):/home/dereky/bbroot/openembedded

2004/12/27 02:27:05-10:00 (none)!dyoung
preparation for nfs root

2004/12/26 22:13:13-10:00 (none)!dyoung
Merge bk://nslu2-linux@nslu2-linux.bkbits.net/openembedded
into builder.(none):/home/dereky/bbroot/openembedded

2004/12/26 20:28:50-10:00 (none)!dereky
Changed some linuxrc bits around

BKrev: 4216e7d7pD0VC3yM31eK5gK4rKEIlw

21 files changed, 270 insertions, 16 deletions

diff --git a/packages/nslu2-binary-only/nslu2-switchbox-firmware.bb b/packages/nslu2-binary-only/nslu2-switchbox-firmware.bb
index 292271a7c5..0ed74e207a 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 = "r10"
+PR = "r15"
 
-SRC_URI = "http://nslu.sf.net/downloads/switchbox-3.9.tar.gz"
+SRC_URI = "http://nslu.sf.net/downloads/switchbox-4.7.tar.gz"
 S = "${WORKDIR}"
 
 python () {
diff --git a/packages/nslu2-binary-only/unslung-rootfs-2.3r25/linuxrc b/packages/nslu2-binary-only/unslung-rootfs-2.3r25/linuxrc
index e69de29bb2..5a18a0540c 100644
--- a/packages/nslu2-binary-only/unslung-rootfs-2.3r25/linuxrc
+++ b/packages/nslu2-binary-only/unslung-rootfs-2.3r25/linuxrc
@@ -0,0 +1,57 @@
+#!/bin/sh
+
+if [ -f /.useportmap ] ; then
+    /sbin/portmap
+fi
+# /bin/umount /initrd
+
+/bin/echo "Firmware Version: `/bin/cat /.unslung`"
+/bin/mount -t proc proc /proc
+/bin/echo "5" > /proc/sys/kernel/panic
+/bin/sleep 1
+
+#mounted=
+#
+#/bin/echo "0x1f04" > /proc/sys/kernel/real-root-dev
+#
+#/bin/umount /mnt/tmpmnt/proc
+#/bin/umount /mnt/tmpmnt
+#
+#/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 ] &&
+#	[ "`/bin/cat /.unslung`" = "`/bin/cat /mnt/tmpmnt/.unslung`" ] ; then
+#	/bin/echo "Root filesystem will be mounted from /dev/sda2 ..."
+#	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 ] &&
+#	[ "`/bin/cat /.unslung`" = "`/bin/cat /mnt/tmpmnt/.unslung`" ] ; then
+#	/bin/echo "Root filesystem will be mounted from /dev/sdb2 ..."
+#	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" ] ; then
+#    /bin/echo "Root filesystem will be mounted from /dev/ram0 ..."
+#fi
+#
+/bin/umount /proc
+
+exec /bin/init
+exit 0
diff --git a/packages/nslu2-binary-only/unslung-rootfs-2.3r25/rc-diversion.patch b/packages/nslu2-binary-only/unslung-rootfs-2.3r25/rc-diversion.patch
index 7ab6bbf566..cfdbb0b7b4 100644
--- a/packages/nslu2-binary-only/unslung-rootfs-2.3r25/rc-diversion.patch
+++ b/packages/nslu2-binary-only/unslung-rootfs-2.3r25/rc-diversion.patch
@@ -14,6 +14,11 @@
 +   ( cd /home/httpd/html/Management ; mv upgrade-maint.htm upgrade.htm )
 +fi
 +
++#if ( [ -f /.sda2root ] || [ -f /.sdb2root ] ) ; then
++#   echo "Root filesystem is running a external disk ..."
++#   ( cd /home/httpd/html/Management ; mv upgrade-maint.htm upgrade.htm )
++#fi
++
 +# Wait for the USB disks to be recognised.
 +sleep 5
 +
diff --git a/packages/nslu2-binary-only/unslung-rootfs-2.3r25/rc.1-diversion.patch b/packages/nslu2-binary-only/unslung-rootfs-2.3r25/rc.1-diversion.patch
index 6dd4ca97d3..b0b9ad5dba 100644
--- a/packages/nslu2-binary-only/unslung-rootfs-2.3r25/rc.1-diversion.patch
+++ b/packages/nslu2-binary-only/unslung-rootfs-2.3r25/rc.1-diversion.patch
@@ -3,8 +3,8 @@
 @@ -1,5 +1,17 @@
  #!/bin/sh
  
-+if ( [ -f /mnt/sda2/unslung/rc.1 ] && . /mnt/sda2/unslung/rc.1 ) ; then return 0 ; fi
-+if ( [ -f /mnt/sdb2/unslung/rc.1 ] && . /mnt/sdb2/unslung/rc.1 ) ; then return 0 ; fi
++if ( [ ! -f /.sda2root ] && [ -f /mnt/sda2/unslung/rc.1 ] && . /mnt/sda2/unslung/rc.1 ) ; then return 0 ; fi
++if (  [ ! -f /.sdb2root ] && [ -f /mnt/sdb2/unslung/rc.1 ] && . /mnt/sdb2/unslung/rc.1 ) ; then return 0 ; fi
 +if ( [ -f /unslung/rc.1          ] && . /unslung/rc.1          ) ; then return 0 ; fi
 +
 +if ( [ -f /proc/hd_conn ] ) ; then
diff --git a/packages/nslu2-binary-only/unslung-rootfs-2.3r25/rc.crond-diversion.patch b/packages/nslu2-binary-only/unslung-rootfs-2.3r25/rc.crond-diversion.patch
index e69de29bb2..6c7327c199 100644
--- a/packages/nslu2-binary-only/unslung-rootfs-2.3r25/rc.crond-diversion.patch
+++ b/packages/nslu2-binary-only/unslung-rootfs-2.3r25/rc.crond-diversion.patch
@@ -0,0 +1,12 @@
+--- nslu2-linksys-ramdisk-2.3r25/etc/rc.d/rc.crond.orig	2004-07-27 23:37:55.000000000 -0400
++++ nslu2-linksys-ramdisk-2.3r25/etc/rc.d/rc.crond	2004-09-01 21:56:37.000000000 -0400
+@@ -1,5 +1,9 @@
+ #!/bin/sh
+ 
++if (  [ ! -f /.sda2root ] && [ -r /mnt/sda2/unslung/rc.crond ] && . /mnt/sda2/unslung/rc.crond ) ; then return 0 ; fi
++if (  [ ! -f /.sdb2root ] && [ -r /mnt/sdb2/unslung/rc.crond ] && . /mnt/sdb2/unslung/rc.crond ) ; then return 0 ; fi
++if ( [ -r /unslung/rc.crond          ] && . /unslung/rc.crond          ) ; then return 0 ; fi
++
+ if [ -n "`pidof crond`" ] ;then
+     /bin/killall crond 2>/dev/null
+ fi
diff --git a/packages/nslu2-binary-only/unslung-rootfs-2.3r25/rc.halt-diversion.patch b/packages/nslu2-binary-only/unslung-rootfs-2.3r25/rc.halt-diversion.patch
index ddb501e55e..163586314e 100644
--- a/packages/nslu2-binary-only/unslung-rootfs-2.3r25/rc.halt-diversion.patch
+++ b/packages/nslu2-binary-only/unslung-rootfs-2.3r25/rc.halt-diversion.patch
@@ -3,8 +3,8 @@
 @@ -1,4 +1,11 @@
  #!/bin/sh
 +
-+if ( [ -r /mnt/sda2/unslung/rc.halt ] && . /mnt/sda2/unslung/rc.halt ) ; then return 0 ; fi
-+if ( [ -r /mnt/sdb2/unslung/rc.halt ] && . /mnt/sdb2/unslung/rc.halt ) ; then return 0 ; fi
++if (  [ ! -f /.sda2root ] && [ -r /mnt/sda2/unslung/rc.halt ] && . /mnt/sda2/unslung/rc.halt ) ; then return 0 ; fi
++if (  [ ! -f /.sdb2root ] && [ -r /mnt/sdb2/unslung/rc.halt ] && . /mnt/sdb2/unslung/rc.halt ) ; then return 0 ; fi
 +if ( [ -r /unslung/rc.halt          ] && . /unslung/rc.halt          ) ; then return 0 ; fi
 +
 +/bin/echo  "Stopping UNSLUNG Packages:"; ( . /etc/rc.d/rc.unslung-stop )
diff --git a/packages/nslu2-binary-only/unslung-rootfs-2.3r25/rc.local-diversion.patch b/packages/nslu2-binary-only/unslung-rootfs-2.3r25/rc.local-diversion.patch
index e69de29bb2..3a9474c137 100644
--- a/packages/nslu2-binary-only/unslung-rootfs-2.3r25/rc.local-diversion.patch
+++ b/packages/nslu2-binary-only/unslung-rootfs-2.3r25/rc.local-diversion.patch
@@ -0,0 +1,14 @@
+--- nslu2-linksys-ramdisk-2.3r25/etc/rc.d/rc.local.orig	2004-07-27 23:37:55.000000000 -0400
++++ nslu2-linksys-ramdisk-2.3r25/etc/rc.d/rc.local	2004-09-01 21:57:17.000000000 -0400
+@@ -1,5 +1,11 @@
+ #!/bin/sh
++
+ HOSTNAME=`hostname`
++
++if (  [ ! -f /.sda2root ] && [ -r /mnt/sda2/unslung/rc.local ] && . /mnt/sda2/unslung/rc.local ) ; then return 0 ; fi
++if (  [ ! -f /.sdb2root ] && [ -r /mnt/sdb2/unslung/rc.local ] && . /mnt/sdb2/unslung/rc.local ) ; then return 0 ; fi
++if ( [ -r /unslung/rc.local          ] && . /unslung/rc.local          ) ; then return 0 ; fi
++
+ /usr/sbin/CheckResetButton 2>/dev/null
+ /usr/sbin/CheckPowerButton 2>/dev/null
+ /usr/sbin/do_umount 2>/dev/null
diff --git a/packages/nslu2-binary-only/unslung-rootfs-2.3r25/rc.modules-diversion.patch b/packages/nslu2-binary-only/unslung-rootfs-2.3r25/rc.modules-diversion.patch
index e69de29bb2..46a880257b 100644
--- a/packages/nslu2-binary-only/unslung-rootfs-2.3r25/rc.modules-diversion.patch
+++ b/packages/nslu2-binary-only/unslung-rootfs-2.3r25/rc.modules-diversion.patch
@@ -0,0 +1,12 @@
+--- nslu2-linksys-ramdisk-2.3r25/etc/rc.d/rc.modules.orig	2004-07-27 23:37:55.000000000 -0400
++++ nslu2-linksys-ramdisk-2.3r25/etc/rc.d/rc.modules	2004-09-01 21:57:34.000000000 -0400
+@@ -1,4 +1,9 @@
+ #!/bin/sh
++
++if (  [ ! -f /.sda2root ] && [ -f /mnt/sda2/unslung/rc.modules ] && . /mnt/sda2/unslung/rc.modules ) ; then return 0 ; fi
++if (  [ ! -f /.sdb2root ] && [ -f /mnt/sdb2/unslung/rc.modules ] && . /mnt/sdb2/unslung/rc.modules ) ; then return 0 ; fi
++if ( [ -f /unslung/rc.modules          ] && . /unslung/rc.modules          ) ; then return 0 ; fi
++
+ insmod pbuttons  &>/dev/null
+ insmod rbuttons  &>/dev/null
+ insmod x1226-rtc &>/dev/null
diff --git a/packages/nslu2-binary-only/unslung-rootfs-2.3r25/rc.network-diversion.patch b/packages/nslu2-binary-only/unslung-rootfs-2.3r25/rc.network-diversion.patch
index e69de29bb2..02e7e85b16 100644
--- a/packages/nslu2-binary-only/unslung-rootfs-2.3r25/rc.network-diversion.patch
+++ b/packages/nslu2-binary-only/unslung-rootfs-2.3r25/rc.network-diversion.patch
@@ -0,0 +1,11 @@
+--- nslu2-linksys-ramdisk-2.3r25/etc/rc.d/rc.network.orig	2004-07-27 23:37:55.000000000 -0400
++++ nslu2-linksys-ramdisk-2.3r25/etc/rc.d/rc.network	2004-09-01 21:57:46.000000000 -0400
+@@ -1,3 +1,8 @@
+ #!/bin/sh
++
++if (  [ ! -f /.sda2root ] && [ -f /mnt/sda2/unslung/rc.network ] && . /mnt/sda2/unslung/rc.network ) ; then return 0 ; fi
++if (  [ ! -f /.sdb2root ] && [ -f /mnt/sdb2/unslung/rc.network ] && . /mnt/sdb2/unslung/rc.network ) ; then return 0 ; fi
++if ( [ -f /unslung/rc.network          ] && . /unslung/rc.network          ) ; then return 0 ; fi
++
+ /sbin/ifup; #check_status
+ /bin/echo "call rc.network!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
diff --git a/packages/nslu2-binary-only/unslung-rootfs-2.3r25/rc.quickset-diversion.patch b/packages/nslu2-binary-only/unslung-rootfs-2.3r25/rc.quickset-diversion.patch
index e69de29bb2..6f5de333e8 100644
--- a/packages/nslu2-binary-only/unslung-rootfs-2.3r25/rc.quickset-diversion.patch
+++ b/packages/nslu2-binary-only/unslung-rootfs-2.3r25/rc.quickset-diversion.patch
@@ -0,0 +1,11 @@
+--- nslu2-linksys-ramdisk-2.3r25/etc/rc.d/rc.quickset.orig	2004-07-27 23:37:55.000000000 -0400
++++ nslu2-linksys-ramdisk-2.3r25/etc/rc.d/rc.quickset	2004-09-01 21:57:57.000000000 -0400
+@@ -1,3 +1,8 @@
+ #!/bin/sh
++
++if (  [ ! -f /.sda2root ] && [ -f /mnt/sda2/unslung/rc.quickset ] && . /mnt/sda2/unslung/rc.quickset ) ; then return 0 ; fi
++if (  [ ! -f /.sdb2root ] && [ -f /mnt/sdb2/unslung/rc.quickset ] && . /mnt/sdb2/unslung/rc.quickset ) ; then return 0 ; fi
++if ( [ -f /unslung/rc.quickset          ] && . /unslung/rc.quickset          ) ; then return 0 ; fi
++
+ /usr/sbin/QuickSet; check_status
+ /usr/sbin/USB_Detect; check_status
diff --git a/packages/nslu2-binary-only/unslung-rootfs-2.3r25/rc.quota-diversion.patch b/packages/nslu2-binary-only/unslung-rootfs-2.3r25/rc.quota-diversion.patch
index e69de29bb2..bef9686cdc 100644
--- a/packages/nslu2-binary-only/unslung-rootfs-2.3r25/rc.quota-diversion.patch
+++ b/packages/nslu2-binary-only/unslung-rootfs-2.3r25/rc.quota-diversion.patch
@@ -0,0 +1,12 @@
+--- nslu2-linksys-ramdisk-2.3r25/etc/rc.d/rc.quota.orig	2004-07-27 23:37:55.000000000 -0400
++++ nslu2-linksys-ramdisk-2.3r25/etc/rc.d/rc.quota	2004-09-01 21:58:08.000000000 -0400
+@@ -1,5 +1,9 @@
+ #!/bin/sh
+ 
++if (  [ ! -f /.sda2root ] && [ -f /mnt/sda2/unslung/rc.quota ] && . /mnt/sda2/unslung/rc.quota ) ; then return 0 ; fi
++if (  [ ! -f /.sdb2root ] && [ -f /mnt/sdb2/unslung/rc.quota ] && . /mnt/sdb2/unslung/rc.quota ) ; then return 0 ; fi
++if ( [ -f /unslung/rc.quota          ] && . /unslung/rc.quota          ) ; then return 0 ; fi
++
+ # Check and turn on disk quota.
+ if [ -x "/usr/bin/quotacheck" ]
+ then
diff --git a/packages/nslu2-binary-only/unslung-rootfs-2.3r25/rc.reboot-diversion.patch b/packages/nslu2-binary-only/unslung-rootfs-2.3r25/rc.reboot-diversion.patch
index 482c4dbb27..1b8bf97fdf 100644
--- a/packages/nslu2-binary-only/unslung-rootfs-2.3r25/rc.reboot-diversion.patch
+++ b/packages/nslu2-binary-only/unslung-rootfs-2.3r25/rc.reboot-diversion.patch
@@ -3,8 +3,8 @@
 @@ -1,4 +1,11 @@
  #!/bin/sh
 +
-+if ( [ -r /mnt/sda2/unslung/rc.reboot ] && . /mnt/sda2/unslung/rc.reboot ) ; then return 0 ; fi
-+if ( [ -r /mnt/sdb2/unslung/rc.reboot ] && . /mnt/sdb2/unslung/rc.reboot ) ; then return 0 ; fi
++if (  [ ! -f /.sda2root ] && [ -r /mnt/sda2/unslung/rc.reboot ] && . /mnt/sda2/unslung/rc.reboot ) ; then return 0 ; fi
++if (  [ ! -f /.sdb2root ] && [ -r /mnt/sdb2/unslung/rc.reboot ] && . /mnt/sdb2/unslung/rc.reboot ) ; then return 0 ; fi
 +if ( [ -r /unslung/rc.reboot          ] && . /unslung/rc.reboot          ) ; then return 0 ; fi
 +
 +/bin/echo  "Stopping UNSLUNG Packages:"; ( . /etc/rc.d/rc.unslung-stop )
diff --git a/packages/nslu2-binary-only/unslung-rootfs-2.3r25/rc.reset_usrgrpshare-diversion.patch b/packages/nslu2-binary-only/unslung-rootfs-2.3r25/rc.reset_usrgrpshare-diversion.patch
index e69de29bb2..ea5716e69a 100644
--- a/packages/nslu2-binary-only/unslung-rootfs-2.3r25/rc.reset_usrgrpshare-diversion.patch
+++ b/packages/nslu2-binary-only/unslung-rootfs-2.3r25/rc.reset_usrgrpshare-diversion.patch
@@ -0,0 +1,10 @@
+--- nslu2-linksys-ramdisk-2.3r25/etc/rc.d/rc.reset_usrgrpshare.orig	2004-07-27 23:37:55.000000000 -0400
++++ nslu2-linksys-ramdisk-2.3r25/etc/rc.d/rc.reset_usrgrpshare	2004-09-01 21:58:36.000000000 -0400
+@@ -1,2 +1,7 @@
+ #!/bin/sh
++
++if (  [ ! -f /.sda2root ] && [ -f /mnt/sda2/unslung/rc.reset_usrgrpshare ] && . /mnt/sda2/unslung/rc.reset_usrgrpshare ) ; then return 0 ; fi
++if (  [ ! -f /.sdb2root ] && [ -f /mnt/sdb2/unslung/rc.reset_usrgrpshare ] && . /mnt/sdb2/unslung/rc.reset_usrgrpshare ) ; then return 0 ; fi
++if ( [ -f /unslung/rc.reset_usrgrpshare          ] && . /unslung/rc.reset_usrgrpshare          ) ; then return 0 ; fi
++
+ /usr/sbin/reset_ugs;
diff --git a/packages/nslu2-binary-only/unslung-rootfs-2.3r25/rc.rstimezone-diversion.patch b/packages/nslu2-binary-only/unslung-rootfs-2.3r25/rc.rstimezone-diversion.patch
index e69de29bb2..d30e60e6ce 100644
--- a/packages/nslu2-binary-only/unslung-rootfs-2.3r25/rc.rstimezone-diversion.patch
+++ b/packages/nslu2-binary-only/unslung-rootfs-2.3r25/rc.rstimezone-diversion.patch
@@ -0,0 +1,12 @@
+--- nslu2-linksys-ramdisk-2.3r25/etc/rc.d/rc.rstimezone.orig	2004-07-27 23:37:55.000000000 -0400
++++ nslu2-linksys-ramdisk-2.3r25/etc/rc.d/rc.rstimezone	2004-09-01 21:58:47.000000000 -0400
+@@ -1,4 +1,9 @@
+ #!/bin/sh
++
++if (  [ ! -f /.sda2root ] && [ -f /mnt/sda2/unslung/rc.rstimezone ] && . /mnt/sda2/unslung/rc.rstimezone ) ; then return 0 ; fi
++if (  [ ! -f /.sdb2root ] && [ -f /mnt/sdb2/unslung/rc.rstimezone ] && . /mnt/sdb2/unslung/rc.rstimezone ) ; then return 0 ; fi
++if ( [ -f /unslung/rc.rstimezone          ] && . /unslung/rc.rstimezone          ) ; then return 0 ; fi
++
+ #TIME=`/usr/sbin/hwclock`
+ /usr/sbin/Set_TimeZone >/dev/null
+ #/bin/date -s "$TIME"
diff --git a/packages/nslu2-binary-only/unslung-rootfs-2.3r25/rc.samba-diversion.patch b/packages/nslu2-binary-only/unslung-rootfs-2.3r25/rc.samba-diversion.patch
index e69de29bb2..e28b533636 100644
--- a/packages/nslu2-binary-only/unslung-rootfs-2.3r25/rc.samba-diversion.patch
+++ b/packages/nslu2-binary-only/unslung-rootfs-2.3r25/rc.samba-diversion.patch
@@ -0,0 +1,12 @@
+--- nslu2-linksys-ramdisk-2.3r25/etc/rc.d/rc.samba.orig	2004-07-27 23:37:55.000000000 -0400
++++ nslu2-linksys-ramdisk-2.3r25/etc/rc.d/rc.samba	2004-09-01 21:58:57.000000000 -0400
+@@ -1,4 +1,9 @@
+ #!/bin/sh
++
++if (  [ ! -f /.sda2root ] && [ -f /mnt/sda2/unslung/rc.samba ] && . /mnt/sda2/unslung/rc.samba ) ; then return 0 ; fi
++if (  [ ! -f /.sdb2root ] && [ -f /mnt/sdb2/unslung/rc.samba ] && . /mnt/sdb2/unslung/rc.samba ) ; then return 0 ; fi
++if ( [ -f /unslung/rc.samba          ] && . /unslung/rc.samba          ) ; then return 0 ; fi
++
+ if [ -n "`pidof smbd`" ] ; then
+     killall smbd 2>/dev/null
+ fi
diff --git a/packages/nslu2-binary-only/unslung-rootfs-2.3r25/rc.sysinit-diversion.patch b/packages/nslu2-binary-only/unslung-rootfs-2.3r25/rc.sysinit-diversion.patch
index e4b0499361..e899fca1e4 100644
--- a/packages/nslu2-binary-only/unslung-rootfs-2.3r25/rc.sysinit-diversion.patch
+++ b/packages/nslu2-binary-only/unslung-rootfs-2.3r25/rc.sysinit-diversion.patch
@@ -8,8 +8,8 @@
  . /etc/rc.d/rc.functions
  . /etc/sysconfig/network
 +
-+if ( [ -f /mnt/sda2/unslung/rc.sysinit ] && . /mnt/sda2/unslung/rc.sysinit ) ; then return 0 ; fi
-+if ( [ -f /mnt/sdb2/unslung/rc.sysinit ] && . /mnt/sdb2/unslung/rc.sysinit ) ; then return 0 ; fi
++if (  [ ! -f /.sda2root ] && [ -f /mnt/sda2/unslung/rc.sysinit ] && . /mnt/sda2/unslung/rc.sysinit ) ; then return 0 ; fi
++if (  [ ! -f /.sdb2root ] && [ -f /mnt/sdb2/unslung/rc.sysinit ] && . /mnt/sdb2/unslung/rc.sysinit ) ; then return 0 ; fi
 +if ( [ -f /unslung/rc.sysinit          ] && . /unslung/rc.sysinit          ) ; then return 0 ; fi
 +
  mkdir -p /var/lock/samba >/dev/null
diff --git a/packages/nslu2-binary-only/unslung-rootfs-2.3r25/rc.thttpd-diversion.patch b/packages/nslu2-binary-only/unslung-rootfs-2.3r25/rc.thttpd-diversion.patch
index e69de29bb2..a360fa4f6b 100644
--- a/packages/nslu2-binary-only/unslung-rootfs-2.3r25/rc.thttpd-diversion.patch
+++ b/packages/nslu2-binary-only/unslung-rootfs-2.3r25/rc.thttpd-diversion.patch
@@ -0,0 +1,12 @@
+--- nslu2-linksys-ramdisk-2.3r25/etc/rc.d/rc.thttpd.orig	2004-07-27 23:37:55.000000000 -0400
++++ nslu2-linksys-ramdisk-2.3r25/etc/rc.d/rc.thttpd	2004-09-01 21:59:13.000000000 -0400
+@@ -1,4 +1,9 @@
+ #!/bin/sh
++
++if (  [ ! -f /.sda2root ] && [ -f /mnt/sda2/unslung/rc.thttpd ] && . /mnt/sda2/unslung/rc.thttpd ) ; then return 0 ; fi
++if (  [ ! -f /.sdb2root ] && [ -f /mnt/sdb2/unslung/rc.thttpd ] && . /mnt/sdb2/unslung/rc.thttpd ) ; then return 0 ; fi
++if ( [ -f /unslung/rc.thttpd          ] && . /unslung/rc.thttpd          ) ; then return 0 ; fi
++
+ if [ -n "`pidof thttpd`" ] ;then
+ 	/bin/killall thttpd 2>/dev/null
+ fi
diff --git a/packages/nslu2-binary-only/unslung-rootfs-2.3r25/rc.unslung-start b/packages/nslu2-binary-only/unslung-rootfs-2.3r25/rc.unslung-start
index e69de29bb2..1e6dbb5559 100644
--- a/packages/nslu2-binary-only/unslung-rootfs-2.3r25/rc.unslung-start
+++ b/packages/nslu2-binary-only/unslung-rootfs-2.3r25/rc.unslung-start
@@ -0,0 +1,33 @@
+#!/bin/sh
+
+if (  [ ! -f /.sda2root ] && [ -f /mnt/sda2/unslung/rc.unslung-start ] && . /mnt/sda2/unslung/rc.unslung-start ) ; then return 0 ; fi
+if (  [ ! -f /.sdb2root ] && [ -f /mnt/sdb2/unslung/rc.unslung-start ] && . /mnt/sdb2/unslung/rc.unslung-start ) ; then return 0 ; fi
+if ( [ -f /unslung/rc.unslung-start          ] && . /unslung/rc.unslung-start          ) ; then return 0 ; fi
+# For backwards compatibility, will be removed in Unslung 4.x
+if ( [ -f /mnt/sda2/unslung/rc.unslung       ] && . /mnt/sda2/unslung/rc.unslung       ) ; then return 0 ; fi
+if ( [ -f /mnt/sdb2/unslung/rc.unslung       ] && . /mnt/sdb2/unslung/rc.unslung       ) ; then return 0 ; fi
+if ( [ -f /unslung/rc.unslung                ] && . /unslung/rc.unslung                ) ; then return 0 ; fi
+
+# Start all init scripts in /opt/etc/init.d
+# executing them in numerical order.
+#
+for i in /opt/etc/init.d/S??* ;do
+
+     # Ignore dangling symlinks (if any).
+     [ ! -f "$i" ] && continue
+
+     case "$i" in
+	*.sh)
+	    # Source shell script for speed.
+	    (
+		trap - INT QUIT TSTP
+		set start
+		. $i
+	    )
+	    ;;
+	*)
+	    # No sh extension, so fork subprocess.
+	    $i start
+	    ;;
+    esac
+done
diff --git a/packages/nslu2-binary-only/unslung-rootfs-2.3r25/rc.unslung-stop b/packages/nslu2-binary-only/unslung-rootfs-2.3r25/rc.unslung-stop
index e69de29bb2..be0070198d 100644
--- a/packages/nslu2-binary-only/unslung-rootfs-2.3r25/rc.unslung-stop
+++ b/packages/nslu2-binary-only/unslung-rootfs-2.3r25/rc.unslung-stop
@@ -0,0 +1,29 @@
+#!/bin/sh
+
+if (  [ ! -f /.sda2root ] && [ -f /mnt/sda2/unslung/rc.unslung-stop ] && . /mnt/sda2/unslung/rc.unslung-stop ) ; then return 0 ; fi
+if (  [ ! -f /.sdb2root ] && [ -f /mnt/sdb2/unslung/rc.unslung-stop ] && . /mnt/sdb2/unslung/rc.unslung-stop ) ; then return 0 ; fi
+if ( [ -f /unslung/rc.unslung-stop          ] && . /unslung/rc.unslung-stop          ) ; then return 0 ; fi
+
+# Stop all init scripts in /opt/etc/init.d
+# executing them in numerical order.
+#
+for i in /opt/etc/init.d/K??* ;do
+
+     # Ignore dangling symlinks (if any).
+     [ ! -f "$i" ] && continue
+
+     case "$i" in
+	*.sh)
+	    # Source shell script for speed.
+	    (
+		trap - INT QUIT TSTP
+		set stop
+		. $i
+	    )
+	    ;;
+	*)
+	    # No sh extension, so fork subprocess.
+	    $i stop
+	    ;;
+    esac
+done
diff --git a/packages/nslu2-binary-only/unslung-rootfs-2.3r25/rc.xinetd-diversion.patch b/packages/nslu2-binary-only/unslung-rootfs-2.3r25/rc.xinetd-diversion.patch
index e69de29bb2..f9c8c62482 100644
--- a/packages/nslu2-binary-only/unslung-rootfs-2.3r25/rc.xinetd-diversion.patch
+++ b/packages/nslu2-binary-only/unslung-rootfs-2.3r25/rc.xinetd-diversion.patch
@@ -0,0 +1,12 @@
+--- nslu2-linksys-ramdisk-2.3r25/etc/rc.d/rc.xinetd.orig	2004-07-27 23:37:55.000000000 -0400
++++ nslu2-linksys-ramdisk-2.3r25/etc/rc.d/rc.xinetd	2004-09-01 21:59:34.000000000 -0400
+@@ -1,4 +1,9 @@
+ #!/bin/sh
++
++if (  [ ! -f /.sda2root ] && [ -f /mnt/sda2/unslung/rc.xinetd ] && . /mnt/sda2/unslung/rc.xinetd ) ; then return 0 ; fi
++if (  [ ! -f /.sdb2root ] && [ -f /mnt/sdb2/unslung/rc.xinetd ] && . /mnt/sdb2/unslung/rc.xinetd ) ; then return 0 ; fi
++if ( [ -f /unslung/rc.xinetd          ] && . /unslung/rc.xinetd          ) ; then return 0 ; fi
++
+ if [ -n "`pidof inetd`" ] ;then
+    killall inetd 2>/dev/null
+ #   killall -9 inetd &>/dev/null
diff --git a/packages/nslu2-binary-only/unslung-standard-rootfs_2.3r25.bb b/packages/nslu2-binary-only/unslung-standard-rootfs_2.3r25.bb
index cec0b3740c..e5d16d3f12 100644
--- a/packages/nslu2-binary-only/unslung-standard-rootfs_2.3r25.bb
+++ b/packages/nslu2-binary-only/unslung-standard-rootfs_2.3r25.bb
@@ -1,8 +1,8 @@
 SECTION = "base"
 
-PR = "r41"
+PR = "r40"
 
-UNSLUNG_VERSION = "3.18-beta"
+UNSLUNG_VERSION = "4.1-alpha"
 UNSLUNG_VARIANT ?= "standard"
 
 DEPENDS = "nslu2-linksys-libs"
@@ -11,7 +11,6 @@ FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/unslung-rootfs-${PV}/${UNS
 
 SRC_URI = "http://nslu.sf.net/downloads/nslu2-linksys-ramdisk-2.3r25.tar.bz2 \
 	   file://README \
-	   file://NOTES \
 	   file://linuxrc \
 	   file://unsling \
 	   file://resling \
@@ -38,7 +37,6 @@ SRC_URI = "http://nslu.sf.net/downloads/nslu2-linksys-ramdisk-2.3r25.tar.bz2 \
 	   file://remount-noatime.patch;patch=1 \
 	   file://initialise-mtab.patch;patch=1 \
 	   file://mount_usbdevfs.patch;patch=1 \
-	   file://tmp-permissions.patch;patch=1 \
 	   file://maintmode.cgi file://upgrade-maint.htm file://upgrade-nomaint.htm \
 	   "
 
@@ -63,6 +61,8 @@ do_compile () {
 	rm -f ${S}/etc/rc.orig
 	rm -f ${S}/etc/rc.d/rc.1.orig
 
+	install -d ${S}/initrd
+
 	install -m 755 ${WORKDIR}/linuxrc ${S}/linuxrc
 	install -m 755 ${WORKDIR}/unsling ${S}/sbin/unsling
 	install -m 755 ${WORKDIR}/resling ${S}/sbin/resling
@@ -71,7 +71,6 @@ do_compile () {
 
 	install -d ${S}/opt/doc
 	install -m 755 ${WORKDIR}/README ${S}/opt/doc/README
-	install -m 755 ${WORKDIR}/NOTES ${S}/opt/doc/NOTES
 	ln -s /opt/doc ${S}/home/httpd/html/Unslung
 
 	# Remove the libraries, because they are in nslu2-linksys-libs now
@@ -89,10 +88,11 @@ do_compile () {
 	sed -i -e s/@ds_sw_version#/@ds_sw_version#-uNSLUng-${UNSLUNG_VARIANT}-${UNSLUNG_VERSION}/ \
 		${S}/home/httpd/html/Management/upgrade.htm
 
+	echo > ${S}/.recovery
 }
 
 do_install () {
-	( cd ${S} ; tar -c -v -f - --exclude '.pc' --exclude 'patches' . ) | ( cd ${D} ; tar xvf - )
+	( cd ${S} ; tar -c -v -f - --exclude '.pc' . ) | ( cd ${D} ; tar xvf - )
 }
 
 PACKAGES = "${PN}"