diff options
| author | Erik Troan <ewt@redhat.com> | 2001-02-22 20:31:52 +0000 |
|---|---|---|
| committer | Erik Troan <ewt@redhat.com> | 2001-02-22 20:31:52 +0000 |
| commit | 213c4241ed89208234764c4a790566247278e787 (patch) | |
| tree | 53281726ad5dab7423b1d3190a5d3dd8a4661549 | |
| parent | cce826314c8b6db12ac29608b46f5923f8d13b98 (diff) | |
| download | anaconda-213c4241ed89208234764c4a790566247278e787.tar.gz anaconda-213c4241ed89208234764c4a790566247278e787.tar.xz anaconda-213c4241ed89208234764c4a790566247278e787.zip | |
rejiggered install method menu creation to work better for cdboots (which
are almost, but not quite, like pcmcia.img)
| -rw-r--r-- | loader/loader.c | 21 |
1 files changed, 13 insertions, 8 deletions
diff --git a/loader/loader.c b/loader/loader.c index d1a03c3f7..2cc7f4900 100644 --- a/loader/loader.c +++ b/loader/loader.c @@ -1406,7 +1406,9 @@ static char * doMountImage(char * location, installNames[numValidMethods] = _(installMethods[i].name); validMethods[numValidMethods++] = i; } -#elif defined(INCLUDE_PCMCIA) +#else + /* platforms with split boot/bootnet disks */ + #if defined(INCLUDE_PCMCIA) for (i = 0; i < numMethods; i++) { int j; @@ -1420,14 +1422,17 @@ static char * doMountImage(char * location, validMethods[numValidMethods++] = i; } } -#else - for (i = 0; i < numMethods; i++) { - if ((networkAvailable && installMethods[i].network) || - (localAvailable && !installMethods[i].network)) { - if (i == defaultMethod) methodNum = numValidMethods; + #endif - installNames[numValidMethods] = _(installMethods[i].name); - validMethods[numValidMethods++] = i; + if (!numValidMethods) { + for (i = 0; i < numMethods; i++) { + if ((networkAvailable && installMethods[i].network) || + (localAvailable && !installMethods[i].network)) { + if (i == defaultMethod) methodNum = numValidMethods; + + installNames[numValidMethods] = _(installMethods[i].name); + validMethods[numValidMethods++] = i; + } } } #endif |