explicit_merge of '601faaded8a6427e29dc8dc43433fe9be662c96c'

              and 'a67386ccbaf4538441ab5d8769e018207ab0c744'
   using ancestor '9c1b32d8825be71ddfdcbe3ddfa31b4cc8bb2aa0'
        to branch 'org.openembedded.dev'

1 files changed, 38 insertions, 2 deletions

diff --git a/packages/nslu2-binary-only/unslung-rootfs-2.3r63/NOTES b/packages/nslu2-binary-only/unslung-rootfs-2.3r63/NOTES
index 4e09b459c2..d37bf07d6b 100644
--- a/packages/nslu2-binary-only/unslung-rootfs-2.3r63/NOTES
+++ b/packages/nslu2-binary-only/unslung-rootfs-2.3r63/NOTES
@@ -168,8 +168,14 @@ Also not that telnet is not enabled by default - there is an openssh package
 and a dropbear package that either can replace telnet access with secure shell
 access.
 
-     - Dropbear package details on NSLU2-Linux wiki at:
+OpenSSH is the simplest to install:
+
+     - OpenSSH package details on NSLU2-Linux wiki at:
+          http://www.nslu2-linux.org/wiki/HowTo/UseOpenSSHForRemoteAccess
+
+Dropbear is preferred by some:
 
+     - Dropbear package details on NSLU2-Linux wiki at:
           http://www.nslu2-linux.org/wiki/HowTo/UseDropBearForRemoteAccess
 
 The rationale behind not enabling telnet by default is ensure that an Unslung
@@ -333,7 +339,8 @@ Split from 3.x stream to allow parallel development.
 
 4.2:
 
-New switchbox implementation with NFS and external USB disk root filesystem support.
+New switchbox implementation with NFS and external USB disk root filesystem
+support.
 
 4.3:
 
@@ -451,3 +458,32 @@ First public release of 5.x firmware.
 6.0:
 
 First alpha release of 6.x Unslung firmware, based on Linksys V2.3R63 firmware.
+
+6.5:
+
+Unsling script now prompts for a root password to be used, additional sanity
+checks added to minimize the chance of an improper unsling.  User feedback
+added to indicate the status (running from internal flash or booted up from
+an external drive) via /etc/motd, ipkg, as well as the main web page.  Improved
+diagnostic messages from unsling.  Added a Linksys customization to "mount"
+to the slingbox version of mount.
+
+6.6:
+
+Changed the code that handles the ".ext3flash" functionality so that it can
+handle booting from either /dev/sda or /dev/sdb.
+Cleanup of the "telnet.htm" management page.
+Unsling now creates the wmtp and utmp files.
+Unsling now "edits" the .../conf/passwd file instead of replacing it.
+Ipkg dependencies fixed so that kernel-modules no longer need "force-install".
+Support for loopback mounting ISO images (loop.o and isofs.o are now created).
+The keyspan.o USB serial kernel-module is also created at build time.
+README file updated to reflect the new unsling script as well as the
+change in preferred port for the primary external disk.
+
+6.7:
+
+Added original "netconsole" code as a kernel module
+Fixed problem with password changing from the GUI and automatic mounting of
+drives and flash devices in port 1.
+Remove unnecessary directory /lib/modules/2.4.22-xfs/pcmcia.