diff options
| author | g2@giantshoulder.com <g2@giantshoulder.com> | 2005-03-23 19:15:11 +0000 |
|---|---|---|
| committer | g2@giantshoulder.com <g2@giantshoulder.com> | 2005-03-23 19:15:11 +0000 |
| commit | 29d39c66930d2e04f6a52b9468c236b72faee073 (patch) | |
| tree | dc96ba4ce7a343bccb57e1d6a1e5d01685490029 /packages/nslu2-binary-only | |
| parent | 3bd321a6be3c38e6d0de401d61b156d28c4eec99 (diff) | |
Merge nslu2-linux@nslu2-linux.bkbits.net:openembedded
into giantshoulder.com:/home/tom/dev/openslug/openembedded
2005/03/23 08:41:50-08:00 bkbits.net!nslu2-linux.adm
Merge bk://oe-devel.bkbits.net/openembedded
into bkbits.net:/repos/n/nslu2-linux/openembedded
2005/03/23 16:34:02+00:00 rpsys.net!RP
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded
into tim.rpsys.net:/usr/oe/openembedded
2005/03/23 16:32:05+00:00 rpsys.net!RP
openzaurus-2.6: fix typo
2005/03/23 17:31:58+01:00 local!hrw
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded/
into marcinj.local:/home/hrw/zaurus/bb/openembedded
2005/03/23 17:31:35+01:00 local!hrw
updated kdepimpi to 2.0.20
2005/03/23 07:41:31-08:00 bkbits.net!nslu2-linux.adm
Merge bk://oe-devel.bkbits.net/openembedded
into bkbits.net:/repos/n/nslu2-linux/openembedded
2005/03/23 16:38:17+01:00 zeckescompany.nl!alwin
changed package-dep for meta-opie
2005/03/24 00:32:02+10:30 (none)!rwhitby
Merge bk://nslu2-linux@nslu2-linux.bkbits.net/openembedded
into home.(none):/home/bitbake/openembedded
2005/03/24 00:31:35+10:30 (none)!rwhitby
Made Unslung *not* create ramdisk for /var and /dev when you've unslung to an external disk
2005/03/23 05:41:22-08:00 bkbits.net!nslu2-linux.adm
Merge bk://oe-devel.bkbits.net/openembedded
into bkbits.net:/repos/n/nslu2-linux/openembedded
2005/03/24 00:15:58+10:30 (none)!rwhitby
Fixed the unslung patch for rc.1
2005/03/24 00:06:41+10:30 (none)!rwhitby
Merge bk://nslu2-linux@nslu2-linux.bkbits.net/openembedded
into home.(none):/home/bitbake/openembedded
2005/03/24 00:06:21+10:30 (none)!rwhitby
Unslung 4.7-alpha, with support for external disks on sda1, sda2, sdb1, sdb2.
2005/03/23 14:26:04+01:00 uni-frankfurt.de!mickeyl
rename wlan-ng-modules package per upstream changes
2005/03/23 14:23:31+01:00 uni-frankfurt.de!mickeyl
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded
into r2d2.tm.informatik.uni-frankfurt.de:/local/pkg/oe/packages
2005/03/23 14:23:20+01:00 uni-frankfurt.de!mickeyl
add remind, a console PIM application. in nonworking, because it needs a gcc3.x patch
2005/03/23 04:41:30-08:00 bkbits.net!nslu2-linux.adm
Merge bk://oe-devel.bkbits.net/openembedded
into bkbits.net:/repos/n/nslu2-linux/openembedded
2005/03/23 13:34:56+01:00 mn-solutions.de!schurig
Various twiddles for MNCI "Ramses":
qmake-native: remove my weird attempt to get things right, it was very wrong :-)
gdb: add REPENDS on libthread-db1 to allow debugging of threaded Qt/E 3.x apps
kernel: add bluez-modules
sysvinit: make startup even faster by removing access to /proc/progress
2005/03/23 03:41:24-08:00 bkbits.net!nslu2-linux.adm
Merge bk://oe-devel.bkbits.net/openembedded
into bkbits.net:/repos/n/nslu2-linux/openembedded
2005/03/23 22:12:18+10:30 (none)!rwhitby
Merge bk://nslu2-linux@nslu2-linux.bkbits.net/openembedded
into home.(none):/home/bitbake/openembedded
2005/03/23 22:11:52+10:30 (none)!rwhitby
Added lots of modules for traffic shaping and other various things to OpenSlug kernel
2005/03/23 12:14:09+01:00 (none)!br1
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded
into null.(none):/data/mtx/closed/build/unstable/openembedded
2005/03/23 12:13:44+01:00 (none)!br1
fixed hostapd 0.3.7 and added wpa_supplicant 0.3.8
2005/03/23 11:41:30+01:00 uni-frankfurt.de!mickeyl
remove hostap-daemon from nonworking. hey folks, please look if not already there is a nonworking version before you add a new one
2005/03/23 02:41:23-08:00 bkbits.net!nslu2-linux.adm
Merge bk://oe-devel.bkbits.net/openembedded
into bkbits.net:/repos/n/nslu2-linux/openembedded
2005/03/23 11:38:09+01:00 uni-frankfurt.de!mickeyl
opie-collections: add datebook plugins to standard opie image
2005/03/23 11:35:44+01:00 uni-frankfurt.de!mickeyl
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded
into r2d2.tm.informatik.uni-frankfurt.de:/local/pkg/oe/packages
2005/03/23 11:33:22+01:00 uni-frankfurt.de!mickeyl
add newer gpsd versions and a fixed start/stop script
2005/03/23 11:31:34+01:00 uni-frankfurt.de!mickeyl
opie packaging changes in meta-opie and opie-login
2005/03/23 11:06:47+01:00 (none)!br1
added packages "ser" and "mystun" contributed by Sven-Ola Tuecke
2005/03/23 11:02:05+01:00 (none)!br1
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded
into null.(none):/data/mtx/closed/build/unstable/openembedded
2005/03/22 17:41:23-08:00 bkbits.net!nslu2-linux.adm
Merge bk://oe-devel.bkbits.net/openembedded
into bkbits.net:/repos/n/nslu2-linux/openembedded
2005/03/23 01:26:50+00:00 (none)!cwiiis
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded/
into cwiiisdesktop.(none):/home/cwiiis/Dev/oe/openembedded
2005/03/23 01:26:05+00:00 (none)!cwiiis
Use the sourceforge source for freetype, as it seems to be the primary download location now.
2005/03/23 01:24:53+00:00 (none)!cwiiis
Small gpe-related updates to openzaurus-3.5.3.conf.
2005/03/23 01:23:49+00:00 (none)!cwiiis
Correct XLIBS_MIRROR
2005/03/22 07:41:25-08:00 bkbits.net!nslu2-linux.adm
Merge bk://oe-devel.bkbits.net/openembedded
into bkbits.net:/repos/n/nslu2-linux/openembedded
2005/03/22 16:31:48+01:00 uni-frankfurt.de!mickeyl
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded
into r2d2.tm.informatik.uni-frankfurt.de:/local/pkg/oe/packages
2005/03/22 16:31:38+01:00 uni-frankfurt.de!mickeyl
libqte2: set package arch to machine arch since we supply machine specific patches and flags
2005/03/22 15:11:11+00:00 (none)!cwiiis
Use ?= instead of = in conf/distro/preferred-gpe-versions.inc, so as not to override user-specified settings
2005/03/22 22:57:38+10:30 (none)!rwhitby
Bumped the Openslug kernel PR
2005/03/22 22:53:49+10:30 (none)!rwhitby
Merge bk://nslu2-linux@nslu2-linux.bkbits.net/openembedded
into home.(none):/home/bitbake/openembedded
2005/03/22 22:53:07+10:30 (none)!rwhitby
Changed CONFIG_ATALK from =y to =m in Unslung kernel
2005/03/22 03:41:21-08:00 bkbits.net!nslu2-linux.adm
Merge bk://oe-devel.bkbits.net/openembedded
into bkbits.net:/repos/n/nslu2-linux/openembedded
2005/03/22 12:30:28+01:00 uni-frankfurt.de!mickeyl
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded
into gandalf.tm.informatik.uni-frankfurt.de:/local/pkg/oe/packages
2005/03/22 12:30:12+01:00 uni-frankfurt.de!mickeyl
include tune-xscale in the pxa machines. root file systems can be built with all optimizations since they are machine specific anyway. the unified feed though needs to be built using a tune-strongarm based machine configuration
2005/03/22 12:28:44+01:00 local!hrw
added qpf-gentium font to meta-opie
2005/03/22 12:27:20+01:00 local!hrw
updated qpf-dejavufonts to 1.8
added all rotations
2005/03/22 12:26:15+01:00 local!hrw
added all rotations to qpf-hunkyfonts
2005/03/22 12:09:08+01:00 uni-frankfurt.de!mickeyl
add qpf-gentium, a free font with lots of characters. thanks hrw for converting.
2005/03/22 10:39:58+01:00 uni-frankfurt.de!mickeyl
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded
into r2d2.tm.informatik.uni-frankfurt.de:/local/pkg/oe/packages
2005/03/22 00:41:26-08:00 bkbits.net!nslu2-linux.adm
Merge bk://oe-devel.bkbits.net/openembedded
into bkbits.net:/repos/n/nslu2-linux/openembedded
2005/03/22 07:43:44+00:00 reciva.com!pb
change "h2200_linear" to "linear_h2200".
Reported by Matt Reimer.
2005/03/21 17:41:26-08:00 bkbits.net!nslu2-linux.adm
Merge bk://oe-devel.bkbits.net/openembedded
into bkbits.net:/repos/n/nslu2-linux/openembedded
2005/03/22 01:56:50+01:00 dyndns.org!reenoo
libglade: update to 2.4.2 which fixes improper use of the toolbar API. make no-xml2.patch apply against 2.4.2.
2005/03/22 00:59:21+01:00 uni-frankfurt.de!mickeyl
split tosa machine configuration into generic, 2.4, 2.6 parts
2005/03/22 00:54:55+01:00 uni-frankfurt.de!mickeyl
add a version of orinoco-0.13e that compiles against kernel 2.6 and choose that version for the clamshells and the poodle
2005/03/18 16:13:17+01:00 (none)!br1
added madwifi BSD branch build
2005/03/18 16:12:01+01:00 (none)!br1
added hostap-daemon 0.3.7
BKrev: 4241c03fA7V8WMbGM7hnEqx17eXRkw
Diffstat (limited to 'packages/nslu2-binary-only')
22 files changed, 233 insertions, 48 deletions
diff --git a/packages/nslu2-binary-only/unslung-rootfs-2.3r25/create-ramdisks.patch b/packages/nslu2-binary-only/unslung-rootfs-2.3r25/create-ramdisks.patch index 5783dae078..5ba8bc6607 100644 --- a/packages/nslu2-binary-only/unslung-rootfs-2.3r25/create-ramdisks.patch +++ b/packages/nslu2-binary-only/unslung-rootfs-2.3r25/create-ramdisks.patch @@ -1,27 +1,29 @@ --- nslu2-linksys-ramdisk-2.3r25/etc/rc.d/rc.sysinit.orig 2004-11-09 21:45:46.000000000 +1030 +++ nslu2-linksys-ramdisk-2.3r25/etc/rc.d/rc.sysinit 2004-11-09 21:41:47.000000000 +1030 -@@ -13,7 +13,23 @@ +@@ -13,7 +13,25 @@ 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 ramfs /mnt/tmpmnt -+/bin/cp -rp /dev/* /mnt/tmpmnt/ -+/bin/mkdir -p /dev.state -+/bin/mount -o bind /dev /dev.state -+/bin/mount -o bind /mnt/tmpmnt /dev -+/bin/umount /mnt/tmpmnt -+/bin/echo "Creating ramfs for /var:" -+/bin/mount -t ramfs ramfs /mnt/tmpmnt -o maxsize=256 -+/bin/cp -rp /var/* /mnt/tmpmnt/ -+/bin/mkdir -p /var.state -+/bin/mount -o bind /var /var.state -+/bin/mount -o bind /mnt/tmpmnt /var -+/bin/umount /mnt/tmpmnt -+/bin/killall syslogd -+/bin/killall klogd ++if ( [ ! -f /.sda1root ] && [ ! -f /.sda2root ] && [ ! -f /.sdb1root ] && [ ! -f /.sdb2root ] ) ; then ++ /bin/echo "Creating ramfs for /dev:" ++ /bin/mount -t ramfs ramfs /mnt/tmpmnt ++ /bin/cp -rp /dev/* /mnt/tmpmnt/ ++ /bin/mkdir -p /dev.state ++ /bin/mount -o bind /dev /dev.state ++ /bin/mount -o bind /mnt/tmpmnt /dev ++ /bin/umount /mnt/tmpmnt ++ /bin/echo "Creating ramfs for /var:" ++ /bin/mount -t ramfs ramfs /mnt/tmpmnt -o maxsize=256 ++ /bin/cp -rp /var/* /mnt/tmpmnt/ ++ /bin/mkdir -p /var.state ++ /bin/mount -o bind /var /var.state ++ /bin/mount -o bind /mnt/tmpmnt /var ++ /bin/umount /mnt/tmpmnt ++ /bin/killall syslogd ++ /bin/killall klogd ++fi + mkdir -p /var/log/samba >/dev/null touch /var/log/server.log >/dev/null 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 cfdbb0b7b4..2ee70b19e7 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 @@ -1,6 +1,6 @@ --- nslu2-linksys-ramdisk-2.3r25/etc/rc~ 2004-07-27 23:37:55.000000000 -0400 +++ nslu2-linksys-ramdisk-2.3r25/etc/rc 2004-09-01 21:47:47.000000000 -0400 -@@ -1,4 +1,26 @@ +@@ -1,4 +1,43 @@ ## Simple beta script to verify csr + +if ( [ -f /unslung/rc ] && . /unslung/rc ) ; then return 0 ; fi @@ -14,21 +14,33 @@ + ( 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 ++if ( [ -f /.sda1root ] || [ -f /.sdb1root ] || [ -f /.sda2root ] || [ -f /.sdb2root ] ) ; then ++ echo "Root filesystem is running a external disk ..." ++ ( cd /home/httpd/html/Management ; cp upgrade-maint.htm upgrade.htm ) ++fi + +# Wait for the USB disks to be recognised. +sleep 5 + +if ( [ -f /proc/hd_conn ] ) ; then -+ /bin/mount -t ext3 /dev/sda2 /share/hdd/conf -+ /bin/rm -rf /mnt/sda2 ; /bin/ln -s /share/hdd/conf /mnt/sda2 ++ if ( [ -f /.sda1root ] ) ; then ++ /bin/mount -t ext3 /dev/sda1 /share/hdd/data ++ /bin/rm -rf /mnt/sda1 ; /bin/ln -s /share/hdd/data /mnt/sda1 ++ fi ++ if ( [ -f /.sda2root ] ) ; then ++ /bin/mount -t ext3 /dev/sda2 /share/hdd/conf ++ /bin/rm -rf /mnt/sda2 ; /bin/ln -s /share/hdd/conf /mnt/sda2 ++ fi +fi + +if ( [ -f /proc/hd2_conn ] ) ; then -+ /bin/mount -t ext3 /dev/sdb2 /share/flash/conf -+ /bin/rm -rf /mnt/sdb2 ; /bin/ln -s /share/flash/conf /mnt/sdb2 ++ if ( [ -f /.sdb1root ] ) ; then ++ /bin/mount -t ext3 /dev/sdb2 /share/flash/data ++ /bin/rm -rf /mnt/sdb1 ; /bin/ln -s /share/flash/data /mnt/sdb1 ++ fi ++ if ( [ -f /.sdb2root ] ) ; then ++ /bin/mount -t ext3 /dev/sdb2 /share/flash/conf ++ /bin/rm -rf /mnt/sdb2 ; /bin/ln -s /share/flash/conf /mnt/sdb2 ++ fi +fi + 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 b0b9ad5dba..4cf28fa73a 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 @@ -1,18 +1,30 @@ --- nslu2-linksys-ramdisk-2.3r25/etc/rc.d/rc.1~ 2004-07-27 23:37:55.000000000 -0400 +++ nslu2-linksys-ramdisk-2.3r25/etc/rc.d/rc.1 2004-09-01 21:56:17.000000000 -0400 -@@ -1,5 +1,17 @@ +@@ -1,5 +1,29 @@ #!/bin/sh ++if ( [ ! -f /.sda1root ] && [ -f /mnt/sda1/unslung/rc.1 ] && . /mnt/sda1/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 /.sdb1root ] && [ -f /mnt/sdb1/unslung/rc.1 ] && . /mnt/sdb1/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 -+ /bin/umount /dev/sda2 ++ if ( [ -f /.sda1root ] ) ; then ++ /bin/umount /dev/sda1 ++ fi ++ if ( [ -f /.sda2root ] ) ; then ++ /bin/umount /dev/sda2 ++ fi +fi + +if ( [ -f /proc/hd2_conn ] ) ; then -+ /bin/umount /dev/sdb2 ++ if ( [ -f /.sdb1root ] ) ; then ++ /bin/umount /dev/sdb1 ++ fi ++ if ( [ -f /.sdb2root ] ) ; then ++ /bin/umount /dev/sdb2 ++ fi +fi + #/sbin/ifconfig ixp0 hw ether 00:C0:02:01:01:04 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 6c7327c199..a67abe6ce4 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 @@ -1,9 +1,11 @@ --- 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 @@ +@@ -1,5 +1,11 @@ #!/bin/sh ++if ( [ ! -f /.sda1root ] && [ -r /mnt/sda1/unslung/rc.crond ] && . /mnt/sda1/unslung/rc.crond ) ; then return 0 ; fi +if ( [ ! -f /.sda2root ] && [ -r /mnt/sda2/unslung/rc.crond ] && . /mnt/sda2/unslung/rc.crond ) ; then return 0 ; fi ++if ( [ ! -f /.sdb1root ] && [ -r /mnt/sdb1/unslung/rc.crond ] && . /mnt/sdb1/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 + 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 163586314e..d8592a4f10 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 @@ -1,9 +1,11 @@ --- nslu2-linksys-ramdisk-2.3r25/etc/rc.d/rc.halt.orig 2004-07-27 23:37:55.000000000 -0400 +++ nslu2-linksys-ramdisk-2.3r25/etc/rc.d/rc.halt 2004-09-01 21:57:01.000000000 -0400 -@@ -1,4 +1,11 @@ +@@ -1,4 +1,13 @@ #!/bin/sh + ++if ( [ ! -f /.sda1root ] && [ -r /mnt/sda1/unslung/rc.halt ] && . /mnt/sda1/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 /.sdb1root ] && [ -r /mnt/sdb1/unslung/rc.halt ] && . /mnt/sdb1/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 + 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 3a9474c137..a184e002e3 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 @@ -1,11 +1,13 @@ --- 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 @@ +@@ -1,5 +1,13 @@ #!/bin/sh + HOSTNAME=`hostname` + ++if ( [ ! -f /.sda1root ] && [ -r /mnt/sda1/unslung/rc.local ] && . /mnt/sda1/unslung/rc.local ) ; then return 0 ; fi +if ( [ ! -f /.sda2root ] && [ -r /mnt/sda2/unslung/rc.local ] && . /mnt/sda2/unslung/rc.local ) ; then return 0 ; fi ++if ( [ ! -f /.sdb1root ] && [ -r /mnt/sdb1/unslung/rc.local ] && . /mnt/sdb1/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 + 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 46a880257b..c348351554 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 @@ -1,9 +1,11 @@ --- 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 @@ +@@ -1,4 +1,11 @@ #!/bin/sh + ++if ( [ ! -f /.sda1root ] && [ -f /mnt/sda1/unslung/rc.modules ] && . /mnt/sda1/unslung/rc.modules ) ; then return 0 ; fi +if ( [ ! -f /.sda2root ] && [ -f /mnt/sda2/unslung/rc.modules ] && . /mnt/sda2/unslung/rc.modules ) ; then return 0 ; fi ++if ( [ ! -f /.sdb1root ] && [ -f /mnt/sdb1/unslung/rc.modules ] && . /mnt/sdb1/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 + 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 02e7e85b16..86520804eb 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 @@ -1,9 +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 @@ +@@ -1,3 +1,10 @@ #!/bin/sh + ++if ( [ ! -f /.sda1root ] && [ -f /mnt/sda1/unslung/rc.network ] && . /mnt/sda1/unslung/rc.network ) ; then return 0 ; fi +if ( [ ! -f /.sda2root ] && [ -f /mnt/sda2/unslung/rc.network ] && . /mnt/sda2/unslung/rc.network ) ; then return 0 ; fi ++if ( [ ! -f /.sdb1root ] && [ -f /mnt/sdb1/unslung/rc.network ] && . /mnt/sdb1/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 + 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 6f5de333e8..c1be3cd299 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 @@ -1,9 +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 @@ +@@ -1,3 +1,10 @@ #!/bin/sh + ++if ( [ ! -f /.sda1root ] && [ -f /mnt/sda1/unslung/rc.quickset ] && . /mnt/sda1/unslung/rc.quickset ) ; then return 0 ; fi +if ( [ ! -f /.sda2root ] && [ -f /mnt/sda2/unslung/rc.quickset ] && . /mnt/sda2/unslung/rc.quickset ) ; then return 0 ; fi ++if ( [ ! -f /.sdb1root ] && [ -f /mnt/sdb1/unslung/rc.quickset ] && . /mnt/sdb1/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 + 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 bef9686cdc..2a66ae9a11 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 @@ -1,9 +1,11 @@ --- 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 @@ +@@ -1,5 +1,11 @@ #!/bin/sh ++if ( [ ! -f /.sda1root ] && [ -f /mnt/sda1/unslung/rc.quota ] && . /mnt/sda1/unslung/rc.quota ) ; then return 0 ; fi +if ( [ ! -f /.sda2root ] && [ -f /mnt/sda2/unslung/rc.quota ] && . /mnt/sda2/unslung/rc.quota ) ; then return 0 ; fi ++if ( [ ! -f /.sdb1root ] && [ -f /mnt/sdb1/unslung/rc.quota ] && . /mnt/sdb1/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 + 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 1b8bf97fdf..2d7b8c6694 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 @@ -1,9 +1,11 @@ --- nslu2-linksys-ramdisk-2.3r25/etc/rc.d/rc.reboot.orig 2004-07-27 23:37:55.000000000 -0400 +++ nslu2-linksys-ramdisk-2.3r25/etc/rc.d/rc.reboot 2004-09-01 21:58:19.000000000 -0400 -@@ -1,4 +1,11 @@ +@@ -1,4 +1,13 @@ #!/bin/sh + ++if ( [ ! -f /.sda1root ] && [ -r /mnt/sda1/unslung/rc.reboot ] && . /mnt/sda1/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 /.sdb1root ] && [ -r /mnt/sdb1/unslung/rc.reboot ] && . /mnt/sdb1/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 + 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 ea5716e69a..49d803b91f 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 @@ -1,9 +1,11 @@ --- 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 @@ +@@ -1,2 +1,9 @@ #!/bin/sh + ++if ( [ ! -f /.sda1root ] && [ -f /mnt/sda1/unslung/rc.reset_usrgrpshare ] && . /mnt/sda1/unslung/rc.reset_usrgrpshare ) ; then return 0 ; fi +if ( [ ! -f /.sda2root ] && [ -f /mnt/sda2/unslung/rc.reset_usrgrpshare ] && . /mnt/sda2/unslung/rc.reset_usrgrpshare ) ; then return 0 ; fi ++if ( [ ! -f /.sdb1root ] && [ -f /mnt/sdb1/unslung/rc.reset_usrgrpshare ] && . /mnt/sdb1/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 + 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 d30e60e6ce..14331defed 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 @@ -1,9 +1,11 @@ --- 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 @@ +@@ -1,4 +1,11 @@ #!/bin/sh + ++if ( [ ! -f /.sda1root ] && [ -f /mnt/sda1/unslung/rc.rstimezone ] && . /mnt/sda1/unslung/rc.rstimezone ) ; then return 0 ; fi +if ( [ ! -f /.sda2root ] && [ -f /mnt/sda2/unslung/rc.rstimezone ] && . /mnt/sda2/unslung/rc.rstimezone ) ; then return 0 ; fi ++if ( [ ! -f /.sdb1root ] && [ -f /mnt/sdb1/unslung/rc.rstimezone ] && . /mnt/sdb1/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 + 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 e28b533636..5f9a91b071 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 @@ -1,9 +1,11 @@ --- 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 @@ +@@ -1,4 +1,11 @@ #!/bin/sh + ++if ( [ ! -f /.sda1root ] && [ -f /mnt/sda1/unslung/rc.samba ] && . /mnt/sda1/unslung/rc.samba ) ; then return 0 ; fi +if ( [ ! -f /.sda2root ] && [ -f /mnt/sda2/unslung/rc.samba ] && . /mnt/sda2/unslung/rc.samba ) ; then return 0 ; fi ++if ( [ ! -f /.sdb1root ] && [ -f /mnt/sdb1/unslung/rc.samba ] && . /mnt/sdb1/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 + 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 e899fca1e4..a15113b293 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 @@ -1,6 +1,6 @@ --- nslu2-linksys-ramdisk-2.3r25/etc/rc.d/rc.sysinit.orig 2004-07-27 23:37:55.000000000 -0400 +++ nslu2-linksys-ramdisk-2.3r25/etc/rc.d/rc.sysinit 2004-09-01 21:59:04.000000000 -0400 -@@ -1,7 +1,13 @@ +@@ -1,7 +1,15 @@ #!/bin/sh -export PATH=/bin:/sbin:/usr/bin:/usr/sbin +export PATH=/bin:/sbin:/usr/bin:/usr/sbin:/opt/bin:/opt/sbin @@ -8,7 +8,9 @@ . /etc/rc.d/rc.functions . /etc/sysconfig/network + ++if ( [ ! -f /.sda1root ] && [ -f /mnt/sda1/unslung/rc.sysinit ] && . /mnt/sda1/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 /.sdb1root ] && [ -f /mnt/sdb1/unslung/rc.sysinit ] && . /mnt/sdb1/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 + 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 a360fa4f6b..10f4c03abf 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 @@ -1,9 +1,11 @@ --- 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 @@ +@@ -1,4 +1,11 @@ #!/bin/sh + ++if ( [ ! -f /.sda1root ] && [ -f /mnt/sda1/unslung/rc.thttpd ] && . /mnt/sda1/unslung/rc.thttpd ) ; then return 0 ; fi +if ( [ ! -f /.sda2root ] && [ -f /mnt/sda2/unslung/rc.thttpd ] && . /mnt/sda2/unslung/rc.thttpd ) ; then return 0 ; fi ++if ( [ ! -f /.sdb1root ] && [ -f /mnt/sdb1/unslung/rc.thttpd ] && . /mnt/sdb1/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 + 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 1e6dbb5559..33f2e3ee0b 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 @@ -1,12 +1,10 @@ #!/bin/sh +if ( [ ! -f /.sda1root ] && [ -f /mnt/sda1/unslung/rc.unslung-start ] && . /mnt/sda1/unslung/rc.unslung-start ) ; then return 0 ; fi if ( [ ! -f /.sda2root ] && [ -f /mnt/sda2/unslung/rc.unslung-start ] && . /mnt/sda2/unslung/rc.unslung-start ) ; then return 0 ; fi +if ( [ ! -f /.sdb1root ] && [ -f /mnt/sdb1/unslung/rc.unslung-start ] && . /mnt/sdb1/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. 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 be0070198d..f5e8cedd5f 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 @@ -1,6 +1,8 @@ #!/bin/sh +if ( [ ! -f /.sda1root ] && [ -f /mnt/sda1/unslung/rc.unslung-stop ] && . /mnt/sda1/unslung/rc.unslung-stop ) ; then return 0 ; fi if ( [ ! -f /.sda2root ] && [ -f /mnt/sda2/unslung/rc.unslung-stop ] && . /mnt/sda2/unslung/rc.unslung-stop ) ; then return 0 ; fi +if ( [ ! -f /.sdb1root ] && [ -f /mnt/sdb1/unslung/rc.unslung-stop ] && . /mnt/sdb1/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 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 f9c8c62482..7a742503cc 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 @@ -1,9 +1,11 @@ --- 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 @@ +@@ -1,4 +1,11 @@ #!/bin/sh + ++if ( [ ! -f /.sda1root ] && [ -f /mnt/sda1/unslung/rc.xinetd ] && . /mnt/sda1/unslung/rc.xinetd ) ; then return 0 ; fi +if ( [ ! -f /.sda2root ] && [ -f /mnt/sda2/unslung/rc.xinetd ] && . /mnt/sda2/unslung/rc.xinetd ) ; then return 0 ; fi ++if ( [ ! -f /.sdb1root ] && [ -f /mnt/sdb1/unslung/rc.xinetd ] && . /mnt/sdb1/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 + diff --git a/packages/nslu2-binary-only/unslung-rootfs-2.3r25/remount-noatime.patch b/packages/nslu2-binary-only/unslung-rootfs-2.3r25/remount-noatime.patch index e69de29bb2..730e8ffde1 100644 --- a/packages/nslu2-binary-only/unslung-rootfs-2.3r25/remount-noatime.patch +++ b/packages/nslu2-binary-only/unslung-rootfs-2.3r25/remount-noatime.patch @@ -0,0 +1,31 @@ +--- nslu2-linksys-ramdisk-2.3r25/etc/rc.d/rc.1~ 2004-11-09 21:45:52.000000000 +1030 ++++ nslu2-linksys-ramdisk-2.3r25/etc/rc.d/rc.1 2004-11-09 21:44:27.000000000 +1030 +@@ -27,6 +27,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 /mnt/sda1/.ext3flash ] || [ -f /mnt/sda2/.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 +--- nslu2-linksys-ramdisk-2.3r25/etc/rc.d/rc.quota~ 2004-11-11 00:05:21.000000000 +1030 ++++ nslu2-linksys-ramdisk-2.3r25/etc/rc.d/rc.quota 2004-11-11 00:04:52.000000000 +1030 +@@ -14,6 +14,11 @@ + echo "Done." + fi + ++if ( [ -f /mnt/sda1/.ext3flash ] || [ -f /mnt/sda2/.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/packages/nslu2-binary-only/unslung-rootfs-2.3r25/unsling b/packages/nslu2-binary-only/unslung-rootfs-2.3r25/unsling index 4da1b9ba82..c640630bba 100644 --- a/packages/nslu2-binary-only/unslung-rootfs-2.3r25/unsling +++ b/packages/nslu2-binary-only/unslung-rootfs-2.3r25/unsling @@ -108,15 +108,20 @@ else rm -rf $targ/var ; mv $targ/var.state $targ/var rm -f /.sda1root /.sda2root /.sdb1root /.sdb2root + rm -f $targ/.sda1root $targ/.sda2root $targ/.sdb1root $targ/.sdb2root if [ "$targ" = "/share/hdd/data" ] ; then echo > /.sda1root + echo > $targ/.sda1root elif [ "$targ" = "/share/hdd/conf" ] ; then echo > /.sda2root + echo > $targ/.sda2root elif [ "$targ" = "/share/flash/data" ] ; then echo > /.sdb1root + echo > $targ/.sdb1root elif [ "$targ" = "/share/flash/conf" ] ; then echo > /.sdb2root + echo > $targ/.sdb2root fi fi diff --git a/packages/nslu2-binary-only/unslung-rootfs_2.3r25.bb b/packages/nslu2-binary-only/unslung-rootfs_2.3r25.bb index e69de29bb2..83d2b273e8 100644 --- a/packages/nslu2-binary-only/unslung-rootfs_2.3r25.bb +++ b/packages/nslu2-binary-only/unslung-rootfs_2.3r25.bb @@ -0,0 +1,95 @@ +SECTION = "base" + +PR = "r46" + +UNSLUNG_VERSION = "4.7-alpha" + +DEPENDS = "nslu2-linksys-libs" + +SRC_URI = "http://nslu.sf.net/downloads/nslu2-linksys-ramdisk-2.3r25.tar.bz2 \ + file://README \ + file://linuxrc \ + file://unsling \ + file://resling \ + file://rc.unslung-start \ + file://rc.unslung-stop \ + file://rc-diversion.patch;patch=1 \ + file://rc.1-diversion.patch;patch=1 \ + file://rc.crond-diversion.patch;patch=1 \ + file://rc.halt-diversion.patch;patch=1 \ + file://rc.local-diversion.patch;patch=1 \ + file://rc.modules-diversion.patch;patch=1 \ + file://rc.network-diversion.patch;patch=1 \ + file://rc.quickset-diversion.patch;patch=1 \ + file://rc.quota-diversion.patch;patch=1 \ + file://rc.reboot-diversion.patch;patch=1 \ + file://rc.reset_usrgrpshare-diversion.patch;patch=1 \ + file://rc.rstimezone-diversion.patch;patch=1 \ + file://rc.samba-diversion.patch;patch=1 \ + file://rc.sysinit-diversion.patch;patch=1 \ + file://rc.thttpd-diversion.patch;patch=1 \ + file://rc.xinetd-diversion.patch;patch=1 \ + file://root-passwd.patch;patch=1 \ + file://create-ramdisks.patch;patch=1 \ + file://remount-noatime.patch;patch=1 \ + file://initialise-mtab.patch;patch=1 \ + file://mount_usbdevfs.patch;patch=1 \ + file://maintmode.cgi file://upgrade-maint.htm file://upgrade-nomaint.htm \ + " + +S = "${WORKDIR}/nslu2-linksys-ramdisk-2.3r25" + +python () { + # Don't build unslung images unless we're targeting an nslu2 + mach = bb.data.getVar("MACHINE", d, 1) + dist = bb.data.getVar("DISTRO", d, 1) + if mach != 'nslu2' or dist != 'unslung': + raise bb.parse.SkipPackage("Unslung only builds for the Linksys NSLU2") +} + +do_compile () { + echo "V2.3R25-uNSLUng-${UNSLUNG_VERSION}" > ${S}/.unslung + + sed -i -e s/@version#/@version#-uNSLUng-${UNSLUNG_VERSION}/ ${S}/home/httpd/html/home.htm + sed -i -e 's|> <|><a href="Unslung" class="mainmenu" target="_top">Unslung Doco</a><|' \ + ${S}/home/httpd/html/manhead.htm + + # Somehow these two slipped through - this is easier than updating the tar file. + 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 + install -m 755 ${WORKDIR}/rc.unslung-start ${S}/etc/rc.d/rc.unslung-start + install -m 755 ${WORKDIR}/rc.unslung-stop ${S}/etc/rc.d/rc.unslung-stop + + install -d ${S}/opt/doc + install -m 755 ${WORKDIR}/README ${S}/opt/doc/README + ln -s /opt/doc ${S}/home/httpd/html/Unslung + + # Remove the libraries, because they are in nslu2-linksys-libs now + rm -rf ${S}/lib + + # Install maintenance mode files + install -m 755 ${WORKDIR}/maintmode.cgi ${S}/home/httpd/html/Management + install -m 644 ${WORKDIR}/upgrade-maint.htm ${S}/home/httpd/html/Management/upgrade-maint.htm + install -m 644 ${WORKDIR}/upgrade-nomaint.htm ${S}/home/httpd/html/Management/upgrade-nomaint.htm + install -m 644 ${WORKDIR}/upgrade-nomaint.htm ${S}/home/httpd/html/Management/upgrade.htm + sed -i -e s/@ds_sw_version#/@ds_sw_version#-uNSLUng-${UNSLUNG_VERSION}/ \ + ${S}/home/httpd/html/Management/upgrade-maint.htm + sed -i -e s/@ds_sw_version#/@ds_sw_version#-uNSLUng-${UNSLUNG_VERSION}/ \ + ${S}/home/httpd/html/Management/upgrade-nomaint.htm + sed -i -e s/@ds_sw_version#/@ds_sw_version#-uNSLUng-${UNSLUNG_VERSION}/ \ + ${S}/home/httpd/html/Management/upgrade.htm +} + +do_install () { + ( cd ${S} ; tar -c -v -f - --exclude '.pc' . ) | ( cd ${D} ; tar xvf - ) +} + +PACKAGES = "${PN}" +FILES_${PN} = "/" +RDEPENDS_${PN} = "nslu2-linksys-libs" |