diff options
| author | Matt Wilson <msw@redhat.com> | 1999-09-22 06:08:21 +0000 |
|---|---|---|
| committer | Matt Wilson <msw@redhat.com> | 1999-09-22 06:08:21 +0000 |
| commit | a5a190c37d15fa8ab0358c75ee3c19eff9eab3af (patch) | |
| tree | 5f06da39e2dd4cf31028b99e93ac967179b4bc2d /loader/loader.c | |
| parent | 3bf44a446bf6183f644ce864f17586716939db49 (diff) | |
| download | anaconda-a5a190c37d15fa8ab0358c75ee3c19eff9eab3af.tar.gz anaconda-a5a190c37d15fa8ab0358c75ee3c19eff9eab3af.tar.xz anaconda-a5a190c37d15fa8ab0358c75ee3c19eff9eab3af.zip | |
merge from jj
Diffstat (limited to 'loader/loader.c')
| -rw-r--r-- | loader/loader.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/loader/loader.c b/loader/loader.c index 914e178dd..f154eac70 100644 --- a/loader/loader.c +++ b/loader/loader.c @@ -1625,7 +1625,8 @@ int main(int argc, char ** argv) { kdFindScsiList(&kd); kdFindNetList(&kd); - if ((access("/proc/pci", X_OK) || FL_MODDISK(flags)) + if (((access("/proc/bus/pci/devices", X_OK) && + access("/proc/openprom", X_OK)) || FL_MODDISK(flags)) && !ksFile) { startNewt(flags); devLoadDriverDisk(modInfo, modLoaded, modDeps, flags, 1); @@ -1689,7 +1690,9 @@ int main(int argc, char ** argv) { busProbe(modInfo, modLoaded, modDeps, 0, &kd, flags); - if ((access("/proc/pci", X_OK) || FL_NOPROBE(flags)) && !ksFile) { + if (((access("/proc/bus/pci/devices", X_OK) && + access("/proc/openprom", X_OK)) || + FL_NOPROBE(flags)) && !ksFile) { manualDeviceCheck(modInfo, modLoaded, modDeps, &kd, flags); } |