summaryrefslogtreecommitdiff
path: root/packages
diff options
context:
space:
mode:
authorMike Westerhof <mwester@dls.net>2006-03-01 02:23:55 +0000
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>2006-03-01 02:23:55 +0000
commitf3c738f66b66c663f682f9154b200ffeae89902d (patch)
tree02b5516abe638cd38de157e5db3d8c9370bc5123 /packages
parent74b0c595d3322c18ea52fafe97b2e67ba5ccc01f (diff)
unslung-rootfs: unsling fix, empty pcmcia dir fix - unsling script fixed for no-automatic mount, updated README and NOTES, change to remove empty pcmcia dir
Diffstat (limited to 'packages')
-rw-r--r--packages/meta/unslung-image.bb5
-rw-r--r--packages/nslu2-binary-only/unslung-rootfs-2.3r63/NOTES29
-rw-r--r--packages/nslu2-binary-only/unslung-rootfs-2.3r63/README24
-rwxr-xr-xpackages/nslu2-binary-only/unslung-rootfs-2.3r63/unsling28
-rw-r--r--packages/nslu2-binary-only/unslung-rootfs_2.3r63.bb2
5 files changed, 64 insertions, 24 deletions
diff --git a/packages/meta/unslung-image.bb b/packages/meta/unslung-image.bb
index caedab6b48..8ab50cebf4 100644
--- a/packages/meta/unslung-image.bb
+++ b/packages/meta/unslung-image.bb
@@ -1,5 +1,5 @@
LICENSE = MIT
-PR = "r12"
+PR = "r13"
IMAGE_BASENAME = "unslung"
@@ -55,6 +55,9 @@ unslung_clean_image () {
echo "exit 0" >> ${IMAGE_ROOTFS}/sbin/depmod
chmod ugo+x ${IMAGE_ROOTFS}/sbin/depmod
+ # Don't need this empty directory hanging around
+ rm -rf ${IMAGE_ROOTFS}/lib/modules/2.4.22-xfs/pcmcia
+
# Strip symbols and fix permissions on the libgcc_s.so.1 library
${STRIP} ${IMAGE_ROOTFS}/lib/libgcc_s.so.1
chmod ugo+x ${IMAGE_ROOTFS}/lib/libgcc_s.so.1
diff --git a/packages/nslu2-binary-only/unslung-rootfs-2.3r63/NOTES b/packages/nslu2-binary-only/unslung-rootfs-2.3r63/NOTES
index 98839fffa1..d37bf07d6b 100644
--- a/packages/nslu2-binary-only/unslung-rootfs-2.3r63/NOTES
+++ b/packages/nslu2-binary-only/unslung-rootfs-2.3r63/NOTES
@@ -470,15 +470,20 @@ 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.
-- Better text, and 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 to be
- "force-installed".
-- Support for mounting ISO images stored on the local disk added
- (kernel-modules 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.
+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.
diff --git a/packages/nslu2-binary-only/unslung-rootfs-2.3r63/README b/packages/nslu2-binary-only/unslung-rootfs-2.3r63/README
index 9dd101c426..2667692af9 100644
--- a/packages/nslu2-binary-only/unslung-rootfs-2.3r63/README
+++ b/packages/nslu2-binary-only/unslung-rootfs-2.3r63/README
@@ -48,16 +48,17 @@ PRE-INSTALLATION CONSIDERATIONS
disk. The remainder of these instructions assume that you have a
suitable external disk or flash disk you will be using for this purpose.
- [A word on ports: completely contrary to previous versions of Unslung,
- the preferred port for the Unslung external disk as of Unslung 6.x is
- often port 2. This will free up the far-more-flexible port number 1
- for other uses.
+ A few words on selecting which port to use:
+
+ Completely contrary to previous versions of Unslung, the preferred port
+ for the Unslung external disk as of Unslung 6.x is often port 2. This
+ will free up the far-more-flexible port number 1 for other uses.
However, this "feature" (part of the Linksys R63 firmware) may cause some
small consternation for users upgrading from earlier versions of Unslung.
- But in general, leaving the drives plugged in as-is will likely be the
- least painful solution. The basic challenge faced by upgraders is that
- *something* must change: if the drive remains in port 1, then it will
+ But in general, swapping the drives between the two ports will likely be
+ the least painful solution. The basic challenge faced by upgraders is
+ that *something* must change: if the drive remains in port 1, then it will
remain mounted at "/share/hdd/..." but the drive nomenclature will change
from "/dev/sda" to "/dev/sdb". On the other hand, if the drive is moved
to port 2, then it will remain "/dev/sda" but it will then be mounted at
@@ -72,7 +73,14 @@ PRE-INSTALLATION CONSIDERATIONS
port 2.
- if you have two drives, and both will be formatted by the NSLU2, then
unsling to the drive in port 1.
- ]
+
+ If you unsling to port 2, and later add a drive in port 1 that will be
+ formatted by the NSLU2, initial testing indicates that it should work
+ as expected -- however, the drive to be added MUST be formatted by the
+ unslung NSLU2 in question, and once formatted, the drive must NOT be
+ removed -- as the unslung NSLU2 will move it's "conf" datafiles to the
+ drive in port 1 during the format, and thus will be dependent upon the
+ presence of both drives for proper operation. You have been warned!
3) The external disk that you use as the target for package installation must
be (or have previously been) formatted by the NSLU2. It is possible to
diff --git a/packages/nslu2-binary-only/unslung-rootfs-2.3r63/unsling b/packages/nslu2-binary-only/unslung-rootfs-2.3r63/unsling
index 51fa7ed871..c8b3dc8662 100755
--- a/packages/nslu2-binary-only/unslung-rootfs-2.3r63/unsling
+++ b/packages/nslu2-binary-only/unslung-rootfs-2.3r63/unsling
@@ -19,12 +19,14 @@ if [ $# -eq 1 ] ; then
targconf=/share/hdd/conf
flag=.sdb1root
htmlinfo="disk1, /dev/sdb1"
+ fixconf=0
elif [ "$1" = "disk2" ] ; then
mtch="/dev/sda1 /share/flash/data ext3 rw 0 0"
targ=/share/flash/data
targconf=/share/flash/conf
flag=.sda1root
htmlinfo="disk2, /dev/sda1"
+ fixconf=1
else
echo $usage
exit 1
@@ -126,13 +128,13 @@ if [ -f $targ/.unslung ] ; then
fi
# Change the root password
-if [ "$nopw" = 0 ] ; then
+if [ "$nopw" -eq 0 ] ; then
echo
echo "Please enter the new root password. This will be the new root"
echo "password used when the NSLU2 boots up with or without disks"
echo
passwd
- if [ $? != 0 ] ; then
+ if [ $? -ne 0 ] ; then
echo "Error setting password."
exit 1
fi
@@ -190,6 +192,28 @@ chmod 644 $targ/var/log/wtmp
touch $targ/var/run/utmp
chmod 644 $targ/var/run/utmp
+# The "user password" Linksys utility is hard-coded to /share/hdd; also the
+# QuickSet utility seems to have some difficulty as well. Ugly fix is to
+# add symlinks if we are unslinging to /share/flash. It might seem more
+# reasonable to point to /etc/passwd, for example, but this approach seems to
+# be more likely to avoid looping symlinks.
+
+if [ "$fixconf" -eq 1 ] ; then
+ ln -s ../../flash/conf/.htpasswd $targ/share/hdd/conf/.htpasswd
+ ln -s ../../flash/conf/backup_sh.conf $targ/share/hdd/conf/backup_sh.conf
+ ln -s ../../flash/conf/config $targ/share/hdd/conf/config
+ ln -s ../../flash/conf/group $targ/share/hdd/conf/group
+ ln -s ../../flash/conf/passwd $targ/share/hdd/conf/passwd
+ ln -s ../../flash/conf/server.log $targ/share/hdd/conf/server.log
+ ln -s ../../flash/conf/share $targ/share/hdd/conf/share
+ ln -s ../../flash/conf/share.info $targ/share/hdd/conf/share.info
+ ln -s ../../flash/conf/smb.conf $targ/share/hdd/conf/smb.conf
+ ln -s ../../flash/conf/smbpasswd $targ/share/hdd/conf/smbpasswd
+ ln -s ../../flash/conf/tmp $targ/share/hdd/conf/tmp
+ ln -s ../../flash/conf/upgrade $targ/share/hdd/conf/upgrade
+ ln -s ../../flash/conf/usrgrp.info $targ/share/hdd/conf/usrgrp.info
+fi
+
# Create the boot flag file.
rm -f /.sd??root $targ/.sd??root
diff --git a/packages/nslu2-binary-only/unslung-rootfs_2.3r63.bb b/packages/nslu2-binary-only/unslung-rootfs_2.3r63.bb
index e9b88acb37..e572411583 100644
--- a/packages/nslu2-binary-only/unslung-rootfs_2.3r63.bb
+++ b/packages/nslu2-binary-only/unslung-rootfs_2.3r63.bb
@@ -1,6 +1,6 @@
SECTION = "base"
-PR = "r9"
+PR = "r10"
DEPENDS = "nslu2-linksys-libs"