diff options
| author | Jeremy Katz <katzj@redhat.com> | 2005-11-22 21:21:42 +0000 |
|---|---|---|
| committer | Jeremy Katz <katzj@redhat.com> | 2005-11-22 21:21:42 +0000 |
| commit | 6e059a9da6cedf875dbebdbe003a420cda198ae3 (patch) | |
| tree | 4c9582034c27e8176138302359da8f0ba95e31c6 /loader2 | |
| parent | 8c592d6ee43cfc1753844d616daf821975008f75 (diff) | |
| download | anaconda-6e059a9da6cedf875dbebdbe003a420cda198ae3.tar.gz anaconda-6e059a9da6cedf875dbebdbe003a420cda198ae3.tar.xz anaconda-6e059a9da6cedf875dbebdbe003a420cda198ae3.zip | |
2005-11-22 Jeremy Katz <katzj@redhat.com>
* loader2/loader.c: Fix /dd.img in initrd (from Dan Carpenter
<dcarpenter AT penguincomputing.com> on anaconda-devel-list)
Diffstat (limited to 'loader2')
| -rw-r--r-- | loader2/loader.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/loader2/loader.c b/loader2/loader.c index 2eef430f0..0fc407387 100644 --- a/loader2/loader.c +++ b/loader2/loader.c @@ -1302,6 +1302,11 @@ int main(int argc, char ** argv) { modInfo, flags); } + /* FIXME: this is a bit of a hack */ + loaderData.modLoaded = modLoaded; + loaderData.modDepsPtr = &modDeps; + loaderData.modInfo = modInfo; + if (!access("/dd.img", R_OK)) { logMessage(INFO, "found /dd.img, loading drivers"); getDDFromSource(&loaderData, "path:/dd.img", flags); @@ -1318,11 +1323,6 @@ int main(int argc, char ** argv) { busProbe(modInfo, modLoaded, modDeps, 0, flags); - /* JKFIXME: should probably not be doing this, but ... */ - loaderData.modLoaded = modLoaded; - loaderData.modDepsPtr = &modDeps; - loaderData.modInfo = modInfo; - /* JKFIXME: we'd really like to do this before the busprobe, but then * we won't have network devices available (and that's the only thing * we support with this right now */ |