Index: VERSION
===================================================================
RCS file: /home/cvsroot/scsidev/VERSION,v
retrieving revision 1.8.2.13
retrieving revision 1.8.2.14
diff -u -p -r1.8.2.13 -r1.8.2.14
--- VERSION	31 Mar 2004 14:42:12 -0000	1.8.2.13
+++ VERSION	15 Sep 2004 20:36:23 -0000	1.8.2.14
@@ -1 +1 @@
-2.34
+2.35
Index: boot.scsidev
===================================================================
RCS file: /home/cvsroot/scsidev/Attic/boot.scsidev,v
retrieving revision 1.1.2.6
retrieving revision 1.1.2.8
diff -u -p -r1.1.2.6 -r1.1.2.8
--- boot.scsidev	31 Mar 2004 14:44:47 -0000	1.1.2.6
+++ boot.scsidev	15 Sep 2004 20:36:23 -0000	1.1.2.8
@@ -8,7 +8,7 @@
 ### BEGIN INIT INFO
 # Provides:          boot.scsidev
 # Required-Start:    boot.rootfsck
-# Should-Start:      noot.udev
+# Should-Start:      boot.udev
 # Required-Stop:
 # Default-Start:     B
 # Default-Stop:
@@ -29,19 +29,19 @@ test "$SCSIDEV_ARGS" = "disable" && exit
 rc_reset
 case "$1" in 
     start|try-restart|restart|force-reload|reload)
-	unset RW
-	if test -r /proc/mounts; then
-		RW=`sed '/^rootfs/d;s/^[^ ]\+ \/ [^ ]\+ \([^ ]\+\).*$/\1/p;d' </proc/self/mounts`
-	fi	
+	#unset RW
+	#if test -r /proc/mounts; then
+	#	RW=`sed '/^rootfs/d;s/^[^ ]\+ \/ [^ ]\+ \([^ ]\+\).*$/\1/p;d' </proc/self/mounts`
+	#fi	
 	echo -n "Scanning SCSI devices and filling /dev/scsi/ "
-	if [ "$RW" != "rw" ]; then
-		mount -o remount,rw /
-	fi
+	#if [ "$RW" != "rw" ]; then
+	#	mount -o remount,rw /
+	#fi
 	$SCSIDEV_BIN $SCSIDEV_ARGS
 	rc_status -v
-	if [ "$1" = "start" -a "$RW" != "rw" ]; then
-		mount -o remount,ro /
-	fi
+	#if [ "$1" = "start" -a "$RW" != "rw" ]; then
+	#	mount -o remount,ro /
+	#fi
 	;;
     stop)
 	#rc_failed 3
Index: scsidev.c
===================================================================
RCS file: /home/cvsroot/scsidev/scsidev.c,v
retrieving revision 1.28.2.51
retrieving revision 1.28.2.55
diff -u -p -r1.28.2.51 -r1.28.2.55
--- scsidev.c	31 Mar 2004 14:47:17 -0000	1.28.2.51
+++ scsidev.c	15 Sep 2004 20:36:23 -0000	1.28.2.55
@@ -176,10 +176,6 @@
  *     - Increase max length of hostname from 64 to 160. (Wolfgang Celeda)
  *   -> 2.33     
  *
- *   * 2004-03-08: Kurt Garloff <garloff@suse.de>:
- *     - 
- *
- *   
  *   * 2004-03-22: Kurt Garloff <garloff@suse.de>:
  *     - Allow to switch off sysfs for debugging (-y)
  *   * 2004-03-31: Kurt Garloff <garloff@suse.de>: 
@@ -189,7 +185,12 @@
  *   -> 2.34.
  *
  *     TODO: other char devices
- *
+ *     
+ *   * 2004-05-24: Chris Townsend <Chris_Townsend@dra-hq.com>
+ *     - Fix bug with channel specified in scsi.alias
+ *   * 2004-06-09: Kurt Garloff <garloff@suse.de>
+ *     - Handle longer partition names
+ *   -> 2.35.
  */
 
 #include <stdio.h>
@@ -210,7 +211,7 @@
 #include <ctype.h>
 #include <getopt.h>
 
-static char rcsid[] ="$Id: scsidev.c,v 1.28.2.51 2004/03/31 14:47:17 garloff Exp $";
+static char rcsid[] ="$Id: scsidev.c,v 1.28.2.55 2004/09/15 20:36:23 garloff Exp $";
 static char *versid = "scsidev " VERSION " 2004-02-09";
 static char *copyright = "Copyright: GNU GPL  (see file COPYING)\n" \
 " (w)  1994--1997 Eric Youngdale <eric@andante.org>\n"\
@@ -1410,7 +1411,7 @@ void create_partitions (sname * spnt)
 	}
 	while (!feof (pf)) {
 		unsigned int maj, min, blk;
-		char nm[8], nm2[8];
+		char nm[64], nm2[64];
 		ptr = fgets (pline, 128, pf);
 		if (!ptr)
 			break;
@@ -1935,7 +1936,7 @@ void trigger_module_loads ()
 
 struct sysfsdev {
 	int maj, min;
-	char nm[7];
+	char nm[23];
 	char tp;
 };
 
@@ -2012,7 +2013,7 @@ int sysfs_getinfo (sname * spnt)
 
 void sysfs_parse (sname *spnt, int idx)
 {	
-	char nm[7];
+	char nm[23];
 	char *p1 = sysfsdevs[idx].nm, *p2 = nm;
 	
 	while (!isdigit(*p1) && *p1)
@@ -2675,7 +2676,7 @@ void build_special ()
 	     */
 	    if( id != -1 && id != spnt->id ) 
 		continue;
-	    if( chan != -1 && id != spnt->chan ) 
+	    if( chan != -1 && chan != spnt->chan )
 		continue;
 	    if( lun != -1 && lun != spnt->lun ) 
 		continue;