diff options
| author | Jeremy Katz <katzj@redhat.com> | 2003-02-10 06:11:40 +0000 |
|---|---|---|
| committer | Jeremy Katz <katzj@redhat.com> | 2003-02-10 06:11:40 +0000 |
| commit | c37685134c085e3c628226dfb7d2577a47eff954 (patch) | |
| tree | af7455123f225bd663abd89b5c0fa4128c77406a | |
| parent | 32fce30394fd22ec71bbf558f4a6495bb8e838b8 (diff) | |
| download | anaconda-c37685134c085e3c628226dfb7d2577a47eff954.tar.gz anaconda-c37685134c085e3c628226dfb7d2577a47eff954.tar.xz anaconda-c37685134c085e3c628226dfb7d2577a47eff954.zip | |
so I can do test mode for kickstart loader stuff
| -rw-r--r-- | loader2/loader.c | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/loader2/loader.c b/loader2/loader.c index 484187d69..ec7eac3bb 100644 --- a/loader2/loader.c +++ b/loader2/loader.c @@ -918,6 +918,7 @@ int main(int argc, char ** argv) { if (testing) flags |= LOADER_FLAGS_TESTING; if (mediacheck) flags |= LOADER_FLAGS_MEDIACHECK; + if (ksFile) flags |= LOADER_FLAGS_KICKSTART; /* JKFIXME: I do NOT like this... it also looks kind of bogus */ #if defined(__s390__) && !defined(__s390x__) @@ -995,13 +996,20 @@ int main(int argc, char ** argv) { /* JKFIXME: loaderData->ksFile is set to the arg from the command line, * and then getKickstartFile() changes it and sets FL_KICKSTART. * kind of weird. */ - if (loaderData.ksFile) { + if (loaderData.ksFile || ksFile) { logMessage("getting kickstart file"); - getKickstartFile(&kd, &loaderData, &flags); + if (!ksFile) + getKickstartFile(&kd, &loaderData, &flags); if (FL_KICKSTART(flags) && - (ksReadCommands(loaderData.ksFile) != LOADER_ERROR)) { + (ksReadCommands((ksFile) ? ksFile : loaderData.ksFile, + flags) != LOADER_ERROR)) { setupKickstart(&loaderData, &flags); } + + /* JKFIXME: this is kind of gross, but we need to do it in case + * a driver disk was loaded. but we should really load them earlier + * but we have a nice chicken and the egg problem. ick */ + busProbe(modInfo, modLoaded, modDeps, 0, &kd, flags); } if (FL_TELNETD(flags)) |