diff options
author | Jeremy Katz <katzj@redhat.com> | 2003-06-12 02:03:59 +0000 |
---|---|---|
committer | Jeremy Katz <katzj@redhat.com> | 2003-06-12 02:03:59 +0000 |
commit | d1aa5609c1845ad8c7bbd123e6e1e7197171719a (patch) | |
tree | 7a00cd578da353801c5c8dbb06f31c800a5afebd /loader2 | |
parent | 3eaede5dcc6b0e5addf1269119ada194fd2d6852 (diff) | |
download | anaconda-d1aa5609c1845ad8c7bbd123e6e1e7197171719a.tar.gz anaconda-d1aa5609c1845ad8c7bbd123e6e1e7197171719a.tar.xz anaconda-d1aa5609c1845ad8c7bbd123e6e1e7197171719a.zip |
merge from taroon. fixes driver disks, side effect of pulling in newanaconda-9.0.92-1
buildinstall stuff
Diffstat (limited to 'loader2')
-rw-r--r-- | loader2/driverdisk.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/loader2/driverdisk.c b/loader2/driverdisk.c index ec063193f..7258a3ba8 100644 --- a/loader2/driverdisk.c +++ b/loader2/driverdisk.c @@ -39,7 +39,7 @@ #include "../isys/probe.h" static char * driverDiskFiles[] = { "modinfo", "modules.dep", "pcitable", - "modules.cgz", "rhdd-6.1", NULL }; + "modules.cgz", NULL }; @@ -58,10 +58,10 @@ static int verifyDriverDisk(char *mntpt, int flags) { /* check for both versions */ sprintf(file, "%s/rhdd", mntpt); - if (!access(file, R_OK)) { + if (access(file, R_OK)) { logMessage("not a new format driver disk, checking for old"); sprintf(file, "%s/rhdd-6.1", mntpt); - if (!access(file, R_OK)) { + if (access(file, R_OK)) { logMessage("can't find either driver disk identifier, bad " "driver disk"); } @@ -90,10 +90,10 @@ static int loadDriverDisk(moduleInfoSet modInfo, moduleList modLoaded, /* check for both versions */ sprintf(file, "%s/rhdd", mntpt); - if (!access(file, R_OK)) { + if (access(file, R_OK)) { version = 0; sprintf(file, "%s/rhdd-6.1", mntpt); - if (!access(file, R_OK)) { + if (access(file, R_OK)) { /* this can't happen, we already verified it! */ return LOADER_BACK; } |