Index: isys/dasd.c =================================================================== RCS file: /usr/local/CVS/anaconda/isys/dasd.c,v retrieving revision 1.6 retrieving revision 1.6.8.1 diff -u -r1.6 -r1.6.8.1 --- isys/dasd.c 15 Jun 2004 14:14:47 -0000 1.6 +++ isys/dasd.c 4 Apr 2007 20:43:23 -0000 1.6.8.1 @@ -84,7 +84,7 @@ memset(v4_hex, 0, 9); strncpy(label, vlabel.volkey, 4); sprintf(v4_hex, "%02x%02x%02x%02x", label[0], label[1], label[2], label[3]); - + if(!strncmp(v4_hex, cms1_hex, 9)) { return 0; } @@ -117,7 +117,11 @@ if ((strstr(line, "unknown") != NULL)) { continue; } - ret = sscanf (line, "%[A-Za-z.0-9](ECKD) at ( %*d: %*d) is %s : %*s", port, devname); + if (strstr(line, "(FBA )") != NULL) { + ret = sscanf (line, "%[A-Za-z.0-9](FBA ) at ( %*d: %*d) is %s : %*s", port, devname); + } else { + ret = sscanf (line, "%[A-Za-z.0-9](ECKD) at ( %*d: %*d) is %s : %*s", port, devname); + } if (ret == 2) { if(!ports) { ports = (char *)malloc(strlen(port) + 1); Index: isys/isys.py =================================================================== RCS file: /usr/local/CVS/anaconda/isys/isys.py,v retrieving revision 1.136.2.13 retrieving revision 1.136.2.14 diff -u -r1.136.2.13 -r1.136.2.14 --- isys/isys.py 8 Feb 2007 19:15:02 -0000 1.136.2.13 +++ isys/isys.py 4 Apr 2007 20:43:23 -0000 1.136.2.14 @@ -294,7 +294,6 @@ ret = {} - # FIXME: need to add dasd probing to kudzu devs = kudzu.probe(kudzu.CLASS_HD | kudzu.CLASS_CDROM | kudzu.CLASS_FLOPPY, kudzu.BUS_UNSPEC, kudzu.PROBE_SAFE) for dev in devs: @@ -367,7 +366,7 @@ else: log("%s has a %s raid signature but no windows parts" %(dev, ret)) - return driveDict("disk") + return dict def floppyDriveDict(): return driveDict("floppy")