diff options
| author | Jeremy Katz <katzj@redhat.com> | 2002-12-03 21:41:35 +0000 |
|---|---|---|
| committer | Jeremy Katz <katzj@redhat.com> | 2002-12-03 21:41:35 +0000 |
| commit | 6ed7dc7a8e4496c3373830ae812ff7464e1c986b (patch) | |
| tree | d4526409e691f9dae666d91ae7642fc3c5e649df /isys | |
| parent | aea22ee9cba62b77dc656ab434fc42f974253264 (diff) | |
| download | anaconda-6ed7dc7a8e4496c3373830ae812ff7464e1c986b.tar.gz anaconda-6ed7dc7a8e4496c3373830ae812ff7464e1c986b.tar.xz anaconda-6ed7dc7a8e4496c3373830ae812ff7464e1c986b.zip | |
ick, the pdc stuff was using balkan to do some filtering. for now, just
ignore pdc devices with the pdc magic.
Diffstat (limited to 'isys')
| -rw-r--r-- | isys/isys.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/isys/isys.c b/isys/isys.c index 4c0e2af11..caf35645c 100644 --- a/isys/isys.c +++ b/isys/isys.c @@ -42,8 +42,6 @@ #include "probe.h" #include "smp.h" #include "lang.h" -#include "../balkan/byteswap.h" -#include "../balkan/balkan.h" #ifndef CDROMEJECT #define CDROMEJECT 0x5309 @@ -728,7 +726,6 @@ static int ideFilter(struct kddevice * dev) { char where[50]; int fd; int rc; - struct partitionTable table; int i; sprintf(where, "/tmp/%s", dev->name); @@ -738,10 +735,16 @@ static int ideFilter(struct kddevice * dev) { rc = pdc_dev_running_raid(fd); /* no pdc magic, so include this device */ - if (rc != 1) + if (rc != 1) { close(fd); return 1; + } + + /* JKFIXME: this needs to be fixed better */ + /* ewww, this used balkan. just ignore pdc devices with pdc magic now */ + return 0; +#if 0 /* it's a pdc device w/o a valid partition table, skip it (probably raid 5) */ if (balkanReadTable(fd, &table)) { @@ -764,6 +767,7 @@ static int ideFilter(struct kddevice * dev) { filesystems */ return 1; +#endif } #endif |