diff options
| author | Jeremy Katz <katzj@redhat.com> | 2004-08-12 22:36:09 +0000 |
|---|---|---|
| committer | Jeremy Katz <katzj@redhat.com> | 2004-08-12 22:36:09 +0000 |
| commit | abf40ae3019ddb67b391e7b7b9873fcfd275602d (patch) | |
| tree | 6c100298a1406b35172f6fa23b1a302f789b1391 /isys/eddsupport.c | |
| parent | 6e1ad4ec9208efeadb6fa10cb62f8c1ba30dd096 (diff) | |
| download | anaconda-abf40ae3019ddb67b391e7b7b9873fcfd275602d.tar.gz anaconda-abf40ae3019ddb67b391e7b7b9873fcfd275602d.tar.xz anaconda-abf40ae3019ddb67b391e7b7b9873fcfd275602d.zip | |
* some devices can be NULL (weird usb-storage stuff)
* if we get -ENOMEDIUM opening a device, don't let that lead us to believe
that there aren't unique sigs
Diffstat (limited to 'isys/eddsupport.c')
| -rw-r--r-- | isys/eddsupport.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/isys/eddsupport.c b/isys/eddsupport.c index 4205c3f5c..59b3303ac 100644 --- a/isys/eddsupport.c +++ b/isys/eddsupport.c @@ -123,6 +123,8 @@ static struct diskMapTable * uniqueSignatureExists(struct device **devices) { } for (devhead = devices, i = 0; (*devhead) != NULL; devhead++, i++) { + if (!(*devhead)->device) + continue; if (readDiskSig((*devhead)->device, &headsig) < 0) { return NULL; } @@ -151,7 +153,7 @@ static int readDiskSig(char *device, uint32_t *disksig) { } fd = open("/tmp/biosdev", O_RDONLY); - if (fd < 0) { + if ((fd < 0) && (errno != -ENOMEDIUM)) { #ifdef STANDALONE fprintf(stderr, "Error opening devce %s: %s\n ", device, strerror(errno)); |