diff options
| author | Chris Lumens <clumens@redhat.com> | 2006-08-03 18:32:27 +0000 |
|---|---|---|
| committer | Chris Lumens <clumens@redhat.com> | 2006-08-03 18:32:27 +0000 |
| commit | c8d224516f7237273972d3a398818dace22465c4 (patch) | |
| tree | a4a3aedd35a80a0b7c9d37dc3d70deab0d4c5663 | |
| parent | 9589856dce17fd625c9afbe485fed8a47f8ecd36 (diff) | |
| download | anaconda-c8d224516f7237273972d3a398818dace22465c4.tar.gz anaconda-c8d224516f7237273972d3a398818dace22465c4.tar.xz anaconda-c8d224516f7237273972d3a398818dace22465c4.zip | |
Don't show method menu if we're installing from CD (#201108).
| -rw-r--r-- | ChangeLog | 3 | ||||
| -rw-r--r-- | loader2/loader.c | 5 |
2 files changed, 6 insertions, 2 deletions
@@ -17,6 +17,9 @@ * loader2/cdinstall.c (setupCdrom): Better error handling and logging. + * loader2/loader.c (doLoaderMain): Don't show method menu if we're + installing from CD (#201108). + 2006-08-03 Jeremy Katz <katzj@redhat.com> * scripts/upd-instroot: Add libvolume_id for gfs2-utils diff --git a/loader2/loader.c b/loader2/loader.c index a791439fc..e9b854d54 100644 --- a/loader2/loader.c +++ b/loader2/loader.c @@ -843,7 +843,7 @@ static char *doLoaderMain(char * location, return url; else { rhcdfnd = 1; - methodNum = 0; /* FIXME: this assumes cdrom is always first */ + methodNum = METHOD_CDROM; } } @@ -919,7 +919,7 @@ static char *doLoaderMain(char * location, needed = -1; - if (loaderData->method && (methodNum != -1)) { + if (loaderData->method != -1 && methodNum != -1) { rc = 1; } else { /* we need to set these each time through so that we get @@ -939,6 +939,7 @@ static char *doLoaderMain(char * location, 30, 10, 20, 6, installNames, &methodNum, _("OK"), _("Back"), NULL); } + if (rc && rc != 1) { step = STEP_KBD; dir = -1; |