summaryrefslogtreecommitdiffstats
path: root/loader2
diff options
context:
space:
mode:
authorJeremy Katz <katzj@redhat.com>2006-07-28 03:13:34 +0000
committerJeremy Katz <katzj@redhat.com>2006-07-28 03:13:34 +0000
commit27a1744f9ba4c0382eb8f9d4da53ea97da75cd1d (patch)
treea5d481db7cd6ecea1b2bfd0ea2ccce73f8bcdb87 /loader2
parent07a905eaf6813c43fb443e8348ebfc727d8dc4d8 (diff)
downloadanaconda-27a1744f9ba4c0382eb8f9d4da53ea97da75cd1d.tar.gz
anaconda-27a1744f9ba4c0382eb8f9d4da53ea97da75cd1d.tar.xz
anaconda-27a1744f9ba4c0382eb8f9d4da53ea97da75cd1d.zip
2006-07-27 Jeremy Katz <katzj@redhat.com>
* loader2/loader.c (doLoaderMain): Fix method=
Diffstat (limited to 'loader2')
-rw-r--r--loader2/loader.c15
1 files changed, 7 insertions, 8 deletions
diff --git a/loader2/loader.c b/loader2/loader.c
index 91f84e9df..a586fffee 100644
--- a/loader2/loader.c
+++ b/loader2/loader.c
@@ -823,17 +823,16 @@ static char *doLoaderMain(char * location,
for (i = 0; i < numMethods; i++, numValidMethods++) {
installNames[numValidMethods] = installMethods[i].name;
validMethods[numValidMethods] = i;
-
- /* have we preselected this to be our install method? */
- if (loaderData->method >= 0) {
- methodNum = numValidMethods;
- /* disable the fast path (#102652) */
- flags |= LOADER_FLAGS_ASKMETHOD;
- }
}
-
installNames[numValidMethods] = NULL;
+ /* have we preselected this to be our install method? */
+ if (loaderData->method >= 0) {
+ methodNum = loaderData->method;
+ /* disable the fast path (#102652) */
+ flags |= LOADER_FLAGS_ASKMETHOD;
+ }
+
/* check to see if we have a CD. If we have one, then
* we can fast-path the CD and not make people answer questions in
* text mode. */