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

1 files changed, 2 insertions, 2 deletions

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