Merge nslu2-linux@nslu2-linux.bkbits.net:packages

into hyperion.kergoth.com:/home/kergoth/code/packages

2004/11/19 13:40:41-08:00 bkbits.net!nslu2-linux.adm
Merge bk://openembedded.bkbits.net/packages-devel
into bkbits.net:/repos/n/nslu2-linux/packages

2004/11/20 00:53:51+10:30 (none)!rwhitby
Removed booting from external disks from switchbox (still exists in unslung ramdisk image).  Updated ext3flash functionality for jffs2 support.  Removed errant symlink in OE repo.  Updated unslung and openslug to use switchbox version 3.3 (which no longer has the 10 second delay).

2004/11/19 05:03:18-08:00 (none)!jacques
Merge bk://nslu2-linux@nslu2-linux.bkbits.net/packages
into home.(none):/home/packages/oe/nslu2/packages

2004/11/19 04:59:56-08:00 (none)!jacques
removed dependency of openslug-image on task-bootstrap

2004/11/19 00:35:32-08:00 bkbits.net!nslu2-linux.adm
Merge bk://openembedded.bkbits.net/packages-devel
into bkbits.net:/repos/n/nslu2-linux/packages

2004/11/18 22:52:46+10:30 (none)!rwhitby
Forgot to add ixp4xx-csr and ixp425-eth to DEPENDS too.

2004/11/18 22:47:43+10:30 (none)!rwhitby
Third try at adding ixp4xx-csr and ixp425-eth to openslug.

2004/11/18 22:42:02+10:30 (none)!rwhitby
 ixp4xx-csr.

2004/11/18 22:37:35+10:30 (none)!rwhitby
Added ixp4xx-csr and ixp425-eth to openslug.

2004/11/18 21:42:02+10:30 (none)!rwhitby
Merge bk://nslu2-linux@nslu2-linux.bkbits.net/packages
into home.(none):/home/openembedded/packages

2004/11/18 21:41:25+10:30 (none)!rwhitby
Added the build timing annoyance patch to ixp4xx-csr.

2004/11/17 23:44:00-08:00 (none)!jacques
removed hdparm because it does not build

2004/11/17 23:11:47-08:00 (none)!jacques
updated openslug-specific busybox defconfig

2004/11/17 22:08:07-08:00 (none)!jacques
fixed bugs in ixp4xx-csr and ixp425-eth builds

2004/11/17 21:37:36-08:00 (none)!jacques
added openslug-specific busybox defconfig

2004/11/17 19:02:44-08:00 (none)!jacques
turned down jffs2 logging level (to 0)

2004/11/17 18:17:26-08:00 (none)!jacques
don't attempt to install ext2.gz ramdisk if NSLU2_BUILD_RAMDISK_FIRMWARE is not true

2004/11/18 10:56:25+10:30 (none)!rwhitby
Merge bk://nslu2-linux@nslu2-linux.bkbits.net/packages
into home.(none):/home/openembedded/packages

2004/11/18 10:55:51+10:30 (none)!rwhitby
Obsoleted openslug ramdisk image in favour of a flashdisk image.

2004/11/17 15:25:04-08:00 (none)!jacques
added -f to cp in do_stage to overwrite read-only files on subsequent builds

2004/11/18 08:22:26+10:30 (none)!rwhitby
Changed openslug kernel root device back to /dev/ram0 until we work out how to switch it the right way for the flashdisk firmware.

BKrev: 419e6ef6Cp7JjJfWEZ29tcJDuVKyMw

5 files changed, 577 insertions, 4 deletions

diff --git a/nslu2-binary-only/nslu2-switchbox-firmware.oe b/nslu2-binary-only/nslu2-switchbox-firmware.oe
index 298189ecdb..39f3a0a4b1 100644
--- a/nslu2-binary-only/nslu2-switchbox-firmware.oe
+++ b/nslu2-binary-only/nslu2-switchbox-firmware.oe
@@ -2,9 +2,9 @@ SECTION = "base"
 DEPENDS = ""
 PACKAGES = ""
 INHIBIT_DEFAULT_DEPS = "1"
-PR = "r2"
+PR = "r3"
 
-SRC_URI = "http://www.nslu2-linux.org/downloads/switchbox-3.2.tar.gz"
+SRC_URI = "http://www.nslu2-linux.org/downloads/switchbox-3.3.tar.gz"
 S = "${WORKDIR}"
 
 do_compile () {
diff --git a/nslu2-binary-only/unslung-ramdisk-2.3r25/README b/nslu2-binary-only/unslung-ramdisk-2.3r25/README
index e69de29bb2..9ed4211cf4 100644
--- a/nslu2-binary-only/unslung-ramdisk-2.3r25/README
+++ b/nslu2-binary-only/unslung-ramdisk-2.3r25/README
@@ -0,0 +1,249 @@
+UNSLUNG-2.x family release README
+
+Unslung is a replacement firmware image for the NSLU2 which is designed
+to allow you to mount the root filesystem from an external disk,
+without changing the standard product functionality.
+
+This is intended to be a way of distributing and loading new packages
+for the NSLU2, with minimal changes to the standard user interface and
+firmware.
+
+The changes in the UNSLUNG 2.x firmware from the standard Linksys
+2.3R25 can be found at:
+
+	http://www.nslu2-linux.org/wiki/Unslung/UnslungStandard
+
+For more information about the Unslung firmware, including details on
+how to build it from source code yourself, look at:
+
+	http://www.nslu2-linux.org/wiki/Unslung
+
+PRE-INSTALLATION CONSIDERATIONS
+
+1)  It is strongly recommended that you test telnet Redboot access first.
+    See http://www.nslu2-linux.org/wiki/HowTo/TelnetIntoRedBoot
+2)  It is strongly recommended you select a 'virgin' disk for unslinging;
+    that is a disk that empty; or that can be reformatted.  It is
+    absolutely required that the disk is (or has previously been)
+    formatted by the NSLU2.  It is possible to upgrade from Unslung 1.x
+    to Unslung 2.x without reformatting your disk.  The unsling script
+    will not touch anything in /unslung or /opt, so make sure all your
+    file modifications are in those directories, as you were warned
+    in the README for Unslung 1.x :-)
+ 
+INSTALLATION DETAILS
+
+1) Make sure your NSLU2 is working properly.
+2) Flash unslung-standard-2.x.img as you normally would flash new firmware.
+3) Verify your NSLU2 is working normally at this point.
+4) Make sure that you do *not* have a disk plugged in when you reboot to
+   perform the next part of the installation.
+
+'UNSLINGING' DETAILS
+
+0) Note that this only has to be done when you update the firmware.
+   Also note that you should not have a disk plugged in at this stage.
+1) Enable telnet by going to http://192.168.1.77/Management/telnet.cgi, 
+   and press the enable button.
+2) Telnet into the NSLU2 using the username root and password uNSLUng.
+3) Identify which drive you wish you "unsling", and plug it in.
+   Wait a minute or two while the disk is mounted.  If the disk has not
+   been previously formatted on the NSLU2, then now is the time to do
+   that.  Make sure that the drive is recognised in the web interface.
+4) In the telnet session, run "/sbin/unsling" and watch the ramdisk files
+   be copied to your disk. The files from the ramdisk will be copied to
+   the "conf" partition, not the "data" partition.
+5) Note that unsling will not change the password on your disk, so if
+   you had previously changed the password on a disk, then your password
+   will not be changed.
+6) Reboot.
+
+Congratulations, you're now Unslung!  You should have an extra 10M of free
+memory to use for other things.
+
+Make sure you add an entry to the "The Unslung 2.x" table in the Yahoo
+group.  Just use the next free integer for your Unslung number.
+
+If you make no further changes, your NSLU2 will continue to operate
+normally.  But to customize things, you'll be downloading packages and
+adding stuff to the /unslung directory on the new hard drive root
+using diversion scripts.
+
+POST-INSTALLATION DETAILS
+
+Diversion scripts go into /unslung.  You can divert as many or as few 
+scripts as you like.  Simply add the name of the standard rc script 
+into /unslung and it will be run.
+
+For example, I have a script /unslung/rc.local:
+
+#! /bin/sh
+/opt/bin/do_foo
+return 1
+
+That will run at the beginning of the normal /etc/rc.d/rc.local, and then 
+the rest of the factory rc.local will be executed.  If I do NOT want to run
+the factory rc.local, my script would be
+
+#!/bin/sh
+/opt/bin/do_foo
+return 0
+
+That is, if the diversion script returns with something other than 0, it will
+run the rest of the factory script.  
+
+Note that any variable definitions or function declarations are allowed to
+happen before the diversion script is called.  This allows you to use the
+variables and functions defined by the factory script.
+
+PACKAGE INSTALLATION 
+
+1)  Run "ipkg update" on the NSLU2.
+2)  Run "ipkg list" to see the available packages.
+3)  Run "ipkg install <package-name>" to install them.
+4)  Note that if you upgrade an existing 1.11-beta disk, all your
+    downloaded packages will still be on your hard disk and should work as
+    before, but the ipkg system will probably have forgotten what you have
+    downloaded.  You can re-install any you need to by typing
+    "ipk install -force-overwrite <package>".
+
+ADDITIONAL INFORMATION:
+
+1)  If you wish to see the contents of the ramdisk, temporarily make a 
+    directory called /initrd in your new hard drive /, then the ramdisk 
+    will not be dismounted.  You will not see a RAM benefit if you do this,
+    so use with caution.  After you're done looking at the contents of the
+    ramdisk, unmount it and remove the initrd directory for RAM savings on 
+    the next reboot.
+
+2)  The linuxrc is written in such a way that if a known good unslung disk
+    is NOT attached, it will revert to failsafe booting from ramdisk.
+
+3)  There is a version check mechanism which tags your unslung hard disk
+    at a certain firmware version (including the unslung version) and
+    will not boot from it if the versions do not match.  When you flash a
+    new version of unslung, then you must re-run unsling to update the
+    root disk (and that's when you check your diversion scripts to make
+    sure they are still compatible with the new firmware version).
+
+4)  The unsling script will never touch any files under /unslung or /opt,
+    so please store all your additional files there.  However, any existing
+    files that you modify in any other of the standard directories will
+    be overwritten when you next update the firmware and unsling the disk.
+    If you need to modify a file in /etc for example, then write a
+    diversion script which does it on each boot (perhaps by symlinking
+    it to a file in /opt/etc which will not be touched by unsling).
+
+5)  The diversion of startup scripts is done at the lowest granularity,
+    so you can, for instance, just divert the rc.xinetd script if you
+    want, and leave all the others unchanged.
+
+6)  The diversion mechanism allows you to add to, or replace, the Linksys
+    script functionality.
+
+7)  The /sbin/unsling script can take a new version of the Linksys
+    ramdisk, and update your unslung hard disk root filesystem from
+    that.  This makes sure that unslung can take advantage of any new
+    Linksys features.  As noted in item #4, if you have modified any
+    of the files from the Linksys ramdisk, then they will be overwritten.
+    Keep your modifications in /unslung and /opt and they will be safe.
+
+8)  Note that telnet is not enabled by default - there is an openssh
+    package available to replace telnet access with secure shell
+    access.  The rationale behind not enabling it by default is to
+    ensure that an unslung NSLU2 without a hard disk attached has the
+    same network footprint as the standard firmware.
+
+9)  This simple diversion script will enable telnet on boot
+   
+    # /unslung/rc.xinetd 
+    #! /bin/sh
+    echo "telnet  stream  tcp     nowait  root    /usr/sbin/telnetd" > /etc/inetd.conf
+    # Additional lines must append (using >>), ie:
+    # echo "ftp   stream  tcp     nowait  root    /usr/sbin/ftpd -a=passwd" >> /etc/inetd.conf
+    return 1
+
+10) Note that the PATH is set so that downloadable packages do not
+    override the factory executables.  This is so that a package
+    can't break the standard functionality.  You can use a diversion
+    script or a .profile in the /root directory to change the PATH
+    if you would prefer to take the chance and get a different
+    behaviour.
+
+11) The Unslung firmware will automatically execute any scripts
+    which are in /opt/etc/init.d - and this is where any packages
+    put their startup scripts so that they execute on each boot.
+
+CHANGELOG:
+
+1.11:
+
+First public release
+
+1.12:
+
+Added a symlink to slingbox for gzip.  Added flashfs (as simple utility for preserving
+user files across hard disk formats during beta testing).
+
+1.13:
+
+Added LD_LIBRARY_PATH to /etc/profile (only works for telnet and ssh
+access, not for serial or diversion scripts).
+
+1.14:
+
+Added Unslung Doc link to the User Guide page.
+
+2.3:
+
+Moved development to OpenEmbedded.
+
+2.4:
+
+Updated to the latest ipk binary instead of the simple script.
+
+2.5:
+
+Added the real wget (instead of using the busybox version).  This is
+so we can support .netrc files for commercial packages.
+
+2.6:
+
+Fixed the unsling script so it removes conflicting files on an upgrade.
+
+2.7:
+
+Began development of the -able variant.
+
+2.8:
+
+Added the patch for genesys enclosures.
+
+2.9:
+
+Reorganised the various variants into a more consistent scheme.
+
+2.10:
+
+Added the ext3flash-on-disk1 functionality.
+
+2.11:
+
+Added the README to /opt/doc.
+
+2.12:
+
+First public release of 2.x firmware.
+
+3.1:
+
+Added jffs2 functionality.
+
+3.2:
+
+Incorporated switchbox functionality.
+
+3.3:
+
+Added ramdisks for /dev and /var to reduce internal flash writes.
+
diff --git a/nslu2-binary-only/unslung-ramdisk-2.3r25/linuxrc b/nslu2-binary-only/unslung-ramdisk-2.3r25/linuxrc
new file mode 100644
index 0000000000..7e7e477e04
--- /dev/null
+++ b/nslu2-binary-only/unslung-ramdisk-2.3r25/linuxrc
@@ -0,0 +1,46 @@
+#!/bin/sh
+
+/bin/echo "Firmware Version: `/bin/cat /.unslung`"
+
+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 ] &&
+	[ "`/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
+
+exit 0
diff --git a/nslu2-binary-only/unslung-ramdisk-2.3r25/unslung.patch b/nslu2-binary-only/unslung-ramdisk-2.3r25/unslung.patch
index e69de29bb2..2dedb1ac46 100644
--- a/nslu2-binary-only/unslung-ramdisk-2.3r25/unslung.patch
+++ b/nslu2-binary-only/unslung-ramdisk-2.3r25/unslung.patch
@@ -0,0 +1,278 @@
+diff -BurN /dev/null/nslu/.unslung /mnt/nslu/.unslung
+--- /dev/null/nslu/.unslung	1970-01-01 09:30:00.000000000 +0930
++++ /mnt/nslu/.unslung	2004-08-30 21:46:35.000000000 +0930
+@@ -0,0 +1 @@
++V2.3R25-uNSLUng-X.Y
+\ No newline at end of file
+diff -BurN /dev/null/nslu/etc/passwd /mnt/nslu/etc/passwd
+--- /dev/null/nslu/etc/passwd	2004-07-27 23:37:55.000000000 -0400
++++ /mnt/nslu/etc/passwd	2004-08-30 09:02:51.000000000 -0400
+@@ -1,4 +1,4 @@
+-root:WeeOvKUvbQ6nI:0:0:root:/root:/bin/sh
++root:t1PLUeOinN/eI:0:0:root:/root:/bin/sh
+ bin:x:1:1:bin:/bin:
+ lp:x:4:7:lp:/share/spool:
+ mail:x:8:12:mail:/var/spool/mail:
+diff -BurN /dev/null/nslu/etc/profile /mnt/nslu/etc/profile
+--- /dev/null/nslu/etc/profile	1969-12-31 19:00:00.000000000 -0500
++++ /mnt/nslu/etc/profile	2004-08-30 09:02:51.000000000 -0400
+@@ -0,0 +1,2 @@
++export PATH=$PATH:/opt/bin:/opt/sbin:/opt/usr/bin:/opt/usr/sbin
++export LD_LIBRARY_PATH=/opt/lib
+diff -BurN /dev/null/nslu/etc/rc /mnt/nslu/etc/rc
+--- /dev/null/nslu/etc/rc	2004-07-27 23:37:55.000000000 -0400
++++ /mnt/nslu/etc/rc	2004-09-01 21:47:47.000000000 -0400
+@@ -1,4 +1,7 @@
+ ## Simple beta script to verify csr
++
++if ( [ -f /unslung/rc ] && . /unslung/rc ) ; then return 0 ; fi
++
+ /usr/bin/Set_Led r_blinking &
+ mount -t proc proc /proc
+ mount -o remount,rw /dev/root /
+diff -BurN /dev/null/nslu/etc/rc.d/rc.1 /mnt/nslu/etc/rc.d/rc.1
+--- /dev/null/nslu/etc/rc.d/rc.1	2004-07-27 23:37:55.000000000 -0400
++++ /mnt/nslu/etc/rc.d/rc.1	2004-09-01 21:56:17.000000000 -0400
+@@ -1,5 +1,7 @@
+ #!/bin/sh
+ 
++if ( [ -f /unslung/rc.1 ] && . /unslung/rc.1 ) ; then return 0 ; fi
++
+ #/sbin/ifconfig ixp0 hw ether 00:C0:02:01:01:04
+ /bin/echo  "Starting Set CGI_ds.conf:"; /etc/rc.d/rc.bootbin; check_status
+ 
+@@ -17,6 +19,10 @@
+ /bin/echo  "Starting Crond :"; . /etc/rc.d/rc.crond
+ /bin/echo  "Starting Rest Task :"; . /etc/rc.d/rc.local
+ 
++if [ -f /.unslung ] ; then
++    /bin/echo  "Starting UNSLUNG Packages:"; ( . /etc/rc.d/rc.unslung )
++fi
++
+ /usr/bin/Set_Led ready
+ /usr/bin/Set_Led beep1
+ /bin/echo  "Checking disk status :"; /usr/sbin/CheckDiskFull 2 >/dev/null
+diff -BurN /dev/null/nslu/etc/rc.d/rc.crond /mnt/nslu/etc/rc.d/rc.crond
+--- /dev/null/nslu/etc/rc.d/rc.crond	2004-07-27 23:37:55.000000000 -0400
++++ /mnt/nslu/etc/rc.d/rc.crond	2004-09-01 21:56:37.000000000 -0400
+@@ -1,5 +1,7 @@
+ #!/bin/sh
+ 
++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 -BurN /dev/null/nslu/etc/rc.d/rc.halt /mnt/nslu/etc/rc.d/rc.halt
+--- /dev/null/nslu/etc/rc.d/rc.halt	2004-07-27 23:37:55.000000000 -0400
++++ /mnt/nslu/etc/rc.d/rc.halt	2004-09-01 21:57:01.000000000 -0400
+@@ -1,4 +1,7 @@
+ #!/bin/sh
++
++if ( [ -r /unslung/rc.halt ] && . /unslung/rc.halt ) ; then return 0 ; fi
++
+ /bin/killall -2 upnpd &>/dev/null
+ /bin/killall nmbd &>/dev/null
+ /bin/killall smbd &>/dev/null
+diff -BurN /dev/null/nslu/etc/rc.d/rc.local /mnt/nslu/etc/rc.d/rc.local
+--- /dev/null/nslu/etc/rc.d/rc.local	2004-07-27 23:37:55.000000000 -0400
++++ /mnt/nslu/etc/rc.d/rc.local	2004-09-01 21:57:17.000000000 -0400
+@@ -1,5 +1,9 @@
+ #!/bin/sh
++
+ HOSTNAME=`hostname`
++
++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 -BurN /dev/null/nslu/etc/rc.d/rc.modules /mnt/nslu/etc/rc.d/rc.modules
+--- /dev/null/nslu/etc/rc.d/rc.modules	2004-07-27 23:37:55.000000000 -0400
++++ /mnt/nslu/etc/rc.d/rc.modules	2004-09-01 21:57:34.000000000 -0400
+@@ -1,4 +1,7 @@
+ #!/bin/sh
++
++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 -BurN /dev/null/nslu/etc/rc.d/rc.network /mnt/nslu/etc/rc.d/rc.network
+--- /dev/null/nslu/etc/rc.d/rc.network	2004-07-27 23:37:55.000000000 -0400
++++ /mnt/nslu/etc/rc.d/rc.network	2004-09-01 21:57:46.000000000 -0400
+@@ -1,3 +1,6 @@
+ #!/bin/sh
++
++if ( [ -f /unslung/rc.network ] && . /unslung/rc.network ) ; then return 0 ; fi
++
+ /sbin/ifup; #check_status
+ /bin/echo "call rc.network!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
+diff -BurN /dev/null/nslu/etc/rc.d/rc.quickset /mnt/nslu/etc/rc.d/rc.quickset
+--- /dev/null/nslu/etc/rc.d/rc.quickset	2004-07-27 23:37:55.000000000 -0400
++++ /mnt/nslu/etc/rc.d/rc.quickset	2004-09-01 21:57:57.000000000 -0400
+@@ -1,3 +1,6 @@
+ #!/bin/sh
++
++if ( [ -f /unslung/rc.quickset ] && . /unslung/rc.quickset ) ; then return 0 ; fi
++
+ /usr/sbin/QuickSet; check_status
+ /usr/sbin/USB_Detect; check_status
+diff -BurN /dev/null/nslu/etc/rc.d/rc.quota /mnt/nslu/etc/rc.d/rc.quota
+--- /dev/null/nslu/etc/rc.d/rc.quota	2004-07-27 23:37:55.000000000 -0400
++++ /mnt/nslu/etc/rc.d/rc.quota	2004-09-01 21:58:08.000000000 -0400
+@@ -1,5 +1,7 @@
+ #!/bin/sh
+ 
++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 -BurN /dev/null/nslu/etc/rc.d/rc.reboot /mnt/nslu/etc/rc.d/rc.reboot
+--- /dev/null/nslu/etc/rc.d/rc.reboot	2004-07-27 23:37:55.000000000 -0400
++++ /mnt/nslu/etc/rc.d/rc.reboot	2004-09-01 21:58:19.000000000 -0400
+@@ -1,4 +1,7 @@
+ #!/bin/sh
++
++if ( [ -r /unslung/rc.reboot ] && . /unslung/rc.reboot ) ; then return 0 ; fi
++
+ /bin/killall -2 upnpd 2>/dev/null
+ sleep 4
+ /sbin/ifdown ixp0
+diff -BurN /dev/null/nslu/etc/rc.d/rc.reset_usrgrpshare /mnt/nslu/etc/rc.d/rc.reset_usrgrpshare
+--- /dev/null/nslu/etc/rc.d/rc.reset_usrgrpshare	2004-07-27 23:37:55.000000000 -0400
++++ /mnt/nslu/etc/rc.d/rc.reset_usrgrpshare	2004-09-01 21:58:36.000000000 -0400
+@@ -1,2 +1,5 @@
+ #!/bin/sh
++
++if ( [ -f /unslung/rc.reset_usrgrpshare ] && . /unslung/rc.reset_usrgrpshare ) ; then return 0 ; fi
++
+ /usr/sbin/reset_ugs;
+diff -BurN /dev/null/nslu/etc/rc.d/rc.rstimezone /mnt/nslu/etc/rc.d/rc.rstimezone
+--- /dev/null/nslu/etc/rc.d/rc.rstimezone	2004-07-27 23:37:55.000000000 -0400
++++ /mnt/nslu/etc/rc.d/rc.rstimezone	2004-09-01 21:58:47.000000000 -0400
+@@ -1,4 +1,7 @@
+ #!/bin/sh
++
++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 -BurN /dev/null/nslu/etc/rc.d/rc.samba /mnt/nslu/etc/rc.d/rc.samba
+--- /dev/null/nslu/etc/rc.d/rc.samba	2004-07-27 23:37:55.000000000 -0400
++++ /mnt/nslu/etc/rc.d/rc.samba	2004-09-01 21:58:57.000000000 -0400
+@@ -1,4 +1,7 @@
+ #!/bin/sh
++
++if ( [ -f /unslung/rc.samba ] && . /unslung/rc.samba ) ; then return 0 ; fi
++
+ if [ -n "`pidof smbd`" ] ; then
+     killall smbd 2>/dev/null
+ fi
+diff -BurN /dev/null/nslu/etc/rc.d/rc.sysinit /mnt/nslu/etc/rc.d/rc.sysinit
+--- /dev/null/nslu/etc/rc.d/rc.sysinit	2004-07-27 23:37:55.000000000 -0400
++++ /mnt/nslu/etc/rc.d/rc.sysinit	2004-09-01 21:59:04.000000000 -0400
+@@ -1,7 +1,16 @@
+ #!/bin/sh
++
+ export PATH=/bin:/sbin:/usr/bin:/usr/sbin
++
++if [ -f /.unslung ] ; then
++    export PATH=${PATH}:/opt/bin:/opt/sbin:/opt/usr/bin:/opt/usr/sbin
++fi
++
+ . /etc/rc.d/rc.functions
+ . /etc/sysconfig/network
++
++if ( [ -f /unslung/rc.sysinit ] && . /unslung/rc.sysinit ) ; then return 0 ; fi
++
+ mkdir -p /var/lock/samba >/dev/null
+ /bin/echo  "Creating ramfs for /var/lock/samba:"; mount -t ramfs none /var/lock/samba -o maxsize=64
+ /bin/echo  "Limit the space of log folder:"; mount -t ramfs none /var/log -o maxsize=128
+diff -BurN /dev/null/nslu/etc/rc.d/rc.thttpd /mnt/nslu/etc/rc.d/rc.thttpd
+--- /dev/null/nslu/etc/rc.d/rc.thttpd	2004-07-27 23:37:55.000000000 -0400
++++ /mnt/nslu/etc/rc.d/rc.thttpd	2004-09-01 21:59:13.000000000 -0400
+@@ -1,4 +1,7 @@
+ #!/bin/sh
++
++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 -BurN /dev/null/nslu/etc/rc.d/rc.xinetd /mnt/nslu/etc/rc.d/rc.xinetd
+--- /dev/null/nslu/etc/rc.d/rc.xinetd	2004-07-27 23:37:55.000000000 -0400
++++ /mnt/nslu/etc/rc.d/rc.xinetd	2004-09-01 21:59:34.000000000 -0400
+@@ -1,4 +1,7 @@
+ #!/bin/sh
++
++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 -BurN /dev/null/nslu/usr/local/passwd /mnt/nslu/usr/local/passwd
+--- /dev/null/nslu/usr/local/passwd	2004-07-27 23:37:56.000000000 -0400
++++ /mnt/nslu/usr/local/passwd	2004-08-30 09:02:51.000000000 -0400
+@@ -1,4 +1,4 @@
+-root:WeeOvKUvbQ6nI:0:0:root:/root:/bin/sh
++root:t1PLUeOinN/eI:0:0:root:/root:/bin/sh
+ bin:x:1:1:bin:/bin:
+ lp:x:4:7:lp:/share/spool:
+ mail:x:8:12:mail:/var/spool/mail:
+--- /dev/null/nslu/etc/rc.d/rc.sysinit	2004-11-09 21:45:46.000000000 +1030
++++ /mnt/nslu/etc/rc.d/rc.sysinit	2004-11-09 21:41:47.000000000 +1030
+@@ -12,8 +12,18 @@
+ if ( [ -f /unslung/rc.sysinit ] && . /unslung/rc.sysinit ) ; then return 0 ; fi
+ 
+ mkdir -p /var/lock/samba >/dev/null
+-/bin/echo  "Creating ramfs for /var/lock/samba:"; mount -t ramfs none /var/lock/samba -o maxsize=64
+-/bin/echo  "Limit the space of log folder:"; mount -t ramfs none /var/log -o maxsize=128
++
++/bin/echo "Creating ramfs for /dev:"
++/bin/mount -t ramfs none /mnt/tmpmnt
++/bin/cp -r /dev/* /mnt/tmpmnt/
++/bin/mount -o bind /mnt/tmpmnt /dev
++/bin/umount /mnt/tmpmnt
++/bin/echo "Creating ramfs for /var:"
++/bin/mount -t ramfs none /mnt/tmpmnt
++/bin/cp -r /var/* /mnt/tmpmnt/
++/bin/mount -o bind /mnt/tmpmnt /var
++/bin/umount /mnt/tmpmnt
++
+ mkdir -p /var/log/samba >/dev/null
+ touch /var/log/server.log >/dev/null
+ chmod 755 /var/log/samba >/dev/null
+--- /dev/null/nslu/etc/rc.d/rc.1.orig	2004-11-09 21:45:52.000000000 +1030
++++ /mnt/nslu/etc/rc.d/rc.1	2004-11-09 21:44:27.000000000 +1030
+@@ -5,6 +5,14 @@
+ #/sbin/ifconfig ixp0 hw ether 00:C0:02:01:01:04
+ /bin/echo  "Starting Set CGI_ds.conf:"; /etc/rc.d/rc.bootbin; check_status
+ 
++if ( [ -f /share/hdd/conf/.ext3flash ] ) ; then
++  /bin/echo  "Remounting /dev/sda1 as ext3flash:"
++  /bin/mount -o remount,rw,noatime /dev/sda1
++  /bin/echo  "Remounting /dev/sda2 as ext3flash:"
++  /bin/mount -o remount,rw,noatime /dev/sda2
++  /bin/echo  "Removing swap from ext3flash:"
++  /sbin/swapoff /dev/sda3
++fi
+ 
+ /bin/echo  "Restore time and timezone:"; /etc/rc.d/rc.rstimezone; check_status
+ /bin/echo  "Restore usrgrpshares:"; /etc/rc.d/rc.reset_usrgrpshare; check_status
+--- /dev/null/nslu/etc/rc.d/rc.quota	2004-11-11 00:05:21.000000000 +1030
++++ /mnt/nslu/etc/rc.d/rc.quota	2004-11-11 00:04:52.000000000 +1030
+@@ -10,6 +10,11 @@
+     echo "Done."
+ fi
+ 
++if ( [ -f /share/hdd/conf/.ext3flash ] ) ; then
++    /bin/echo "Remounting /dev/sda1 as ext3flash:"
++    /bin/mount -o remount,rw,noatime /dev/sda1
++fi
++
+ if [ -x "/usr/bin/quotaon" ]
+ then
+     echo "Turning on quota."
diff --git a/nslu2-binary-only/unslung-standard-ramdisk_2.3r25.oe b/nslu2-binary-only/unslung-standard-ramdisk_2.3r25.oe
index b883a0d770..b072d5b83b 100644
--- a/nslu2-binary-only/unslung-standard-ramdisk_2.3r25.oe
+++ b/nslu2-binary-only/unslung-standard-ramdisk_2.3r25.oe
@@ -1,8 +1,8 @@
 SECTION = "base"
 
-PR = "r20"
+PR = "r21"
 
-UNSLUNG_VERSION = "3.2-alpha"
+UNSLUNG_VERSION = "3.3-alpha"
 UNSLUNG_VARIANT ?= "standard"
 
 DEPENDS = "nslu2-linksys-libs"