diff options
| author | Chris Lumens <clumens@redhat.com> | 2011-01-20 13:00:31 -0500 |
|---|---|---|
| committer | Chris Lumens <clumens@redhat.com> | 2011-01-25 10:31:40 -0500 |
| commit | bbb30b26655f34b187ec3fd8bcfe283044fe02a4 (patch) | |
| tree | 327f0f8ce1863335bc95e8109c54101a0f5cbf41 /loader/loader.c | |
| parent | 43d57dc16e4fab2cde680812f27d3cf32888758c (diff) | |
Don't call preprocessKickstart from within anaconda as well.
Since the loader is doing this now, we can just call it once there, then pass
the preprocessed file location into anaconda via the --kickstart parameter.
Diffstat (limited to 'loader/loader.c')
| -rw-r--r-- | loader/loader.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/loader/loader.c b/loader/loader.c index e980913a2..08b8c3ce8 100644 --- a/loader/loader.c +++ b/loader/loader.c @@ -1824,6 +1824,7 @@ int main(int argc, char ** argv) { char ** argptr, ** tmparg; char * anacondaArgs[50]; + char * outputKSFile = NULL; struct loaderData_s loaderData; @@ -2139,7 +2140,7 @@ int main(int argc, char ** argv) { if (!ksFile) getKickstartFile(&loaderData); if (FL_KICKSTART(flags)) - runKickstart(&loaderData, (ksFile)?ksFile:loaderData.ksFile); + outputKSFile = runKickstart(&loaderData, (ksFile)?ksFile:loaderData.ksFile); } if (FL_EARLY_NETWORKING(flags)) { @@ -2255,9 +2256,12 @@ int main(int argc, char ** argv) { *argptr++ = "--headless"; #endif - if (FL_KICKSTART(flags)) { + /* Pass the local, preprocessed kickstart file to anaconda. There's no + * need for another fetch and another call to preprocessKickstart. + */ + if (FL_KICKSTART(flags) && outputKSFile) { *argptr++ = "--kickstart"; - *argptr++ = loaderData.ksFile; + *argptr++ = outputKSFile; } if (FL_SERIAL(flags)) |
