| 1 |
slords |
1.1 |
Index: isys/dasd.c |
| 2 |
|
|
=================================================================== |
| 3 |
|
|
RCS file: /usr/local/CVS/anaconda/isys/dasd.c,v |
| 4 |
|
|
retrieving revision 1.6 |
| 5 |
|
|
retrieving revision 1.6.8.1 |
| 6 |
|
|
diff -u -r1.6 -r1.6.8.1 |
| 7 |
|
|
--- isys/dasd.c 15 Jun 2004 14:14:47 -0000 1.6 |
| 8 |
|
|
+++ isys/dasd.c 4 Apr 2007 20:43:23 -0000 1.6.8.1 |
| 9 |
|
|
@@ -84,7 +84,7 @@ |
| 10 |
|
|
memset(v4_hex, 0, 9); |
| 11 |
|
|
strncpy(label, vlabel.volkey, 4); |
| 12 |
|
|
sprintf(v4_hex, "%02x%02x%02x%02x", label[0], label[1], label[2], label[3]); |
| 13 |
|
|
- |
| 14 |
|
|
+ |
| 15 |
|
|
if(!strncmp(v4_hex, cms1_hex, 9)) { |
| 16 |
|
|
return 0; |
| 17 |
|
|
} |
| 18 |
|
|
@@ -117,7 +117,11 @@ |
| 19 |
|
|
if ((strstr(line, "unknown") != NULL)) { |
| 20 |
|
|
continue; |
| 21 |
|
|
} |
| 22 |
|
|
- ret = sscanf (line, "%[A-Za-z.0-9](ECKD) at ( %*d: %*d) is %s : %*s", port, devname); |
| 23 |
|
|
+ if (strstr(line, "(FBA )") != NULL) { |
| 24 |
|
|
+ ret = sscanf (line, "%[A-Za-z.0-9](FBA ) at ( %*d: %*d) is %s : %*s", port, devname); |
| 25 |
|
|
+ } else { |
| 26 |
|
|
+ ret = sscanf (line, "%[A-Za-z.0-9](ECKD) at ( %*d: %*d) is %s : %*s", port, devname); |
| 27 |
|
|
+ } |
| 28 |
|
|
if (ret == 2) { |
| 29 |
|
|
if(!ports) { |
| 30 |
|
|
ports = (char *)malloc(strlen(port) + 1); |
| 31 |
|
|
Index: isys/isys.py |
| 32 |
|
|
=================================================================== |
| 33 |
|
|
RCS file: /usr/local/CVS/anaconda/isys/isys.py,v |
| 34 |
|
|
retrieving revision 1.136.2.13 |
| 35 |
|
|
retrieving revision 1.136.2.14 |
| 36 |
|
|
diff -u -r1.136.2.13 -r1.136.2.14 |
| 37 |
|
|
--- isys/isys.py 8 Feb 2007 19:15:02 -0000 1.136.2.13 |
| 38 |
|
|
+++ isys/isys.py 4 Apr 2007 20:43:23 -0000 1.136.2.14 |
| 39 |
|
|
@@ -294,7 +294,6 @@ |
| 40 |
|
|
|
| 41 |
|
|
ret = {} |
| 42 |
|
|
|
| 43 |
|
|
- # FIXME: need to add dasd probing to kudzu |
| 44 |
|
|
devs = kudzu.probe(kudzu.CLASS_HD | kudzu.CLASS_CDROM | kudzu.CLASS_FLOPPY, |
| 45 |
|
|
kudzu.BUS_UNSPEC, kudzu.PROBE_SAFE) |
| 46 |
|
|
for dev in devs: |
| 47 |
|
|
@@ -367,7 +366,7 @@ |
| 48 |
|
|
else: |
| 49 |
|
|
log("%s has a %s raid signature but no windows parts" %(dev, ret)) |
| 50 |
|
|
|
| 51 |
|
|
- return driveDict("disk") |
| 52 |
|
|
+ return dict |
| 53 |
|
|
|
| 54 |
|
|
def floppyDriveDict(): |
| 55 |
|
|
return driveDict("floppy") |
| 56 |
|
|
|
Parent Directory
| 
Revision Log
| 
Revision Graph
