diff options
| author | Jeremy Katz <katzj@redhat.com> | 2005-03-29 16:39:14 +0000 |
|---|---|---|
| committer | Jeremy Katz <katzj@redhat.com> | 2005-03-29 16:39:14 +0000 |
| commit | 9f4d9f44cf31c6480fa998ba48d73f1516d80a93 (patch) | |
| tree | a95023ccbc1ad05aba580c4512df0ce7865f9d6c | |
| parent | 4585cf9cb6c79d6126aa5a3c8c4658fd557d6ed1 (diff) | |
| download | anaconda-9f4d9f44cf31c6480fa998ba48d73f1516d80a93.tar.gz anaconda-9f4d9f44cf31c6480fa998ba48d73f1516d80a93.tar.xz anaconda-9f4d9f44cf31c6480fa998ba48d73f1516d80a93.zip | |
2005-03-29 Jeremy Katz <katzj@redhat.com>
* loader2/cdinstall.c (findRedHatCD): Change function to
findAnacondaCD to be more general.
* loader2/cdinstall.h: Likewise.
* loader2/urlinstall.c: Likewise.
* loader2/loader.c: Likewise.
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | loader2/cdinstall.c | 4 | ||||
| -rw-r--r-- | loader2/cdinstall.h | 2 | ||||
| -rw-r--r-- | loader2/loader.c | 2 | ||||
| -rw-r--r-- | loader2/urlinstall.c | 2 |
5 files changed, 11 insertions, 5 deletions
@@ -1,5 +1,11 @@ 2005-03-29 Jeremy Katz <katzj@redhat.com> + * loader2/cdinstall.c (findRedHatCD): Change function to + findAnacondaCD to be more general. + * loader2/cdinstall.h: Likewise. + * loader2/urlinstall.c: Likewise. + * loader2/loader.c: Likewise. + * loader2/lang.c: Fix for removed instlang line. Require tabs for spacing language information. * loader2/lang.h: Remove instlang. diff --git a/loader2/cdinstall.c b/loader2/cdinstall.c index b08832dec..75205fff0 100644 --- a/loader2/cdinstall.c +++ b/loader2/cdinstall.c @@ -391,8 +391,8 @@ char * setupCdrom(char * location, return NULL; } -/* try to find a Red Hat CD non-interactively */ -char * findRedHatCD(char * location, +/* try to find a install CD non-interactively */ +char * findAnacondaCD(char * location, moduleInfoSet modInfo, moduleList modLoaded, moduleDeps modDeps, diff --git a/loader2/cdinstall.h b/loader2/cdinstall.h index e2e7b9e6e..69bc407e6 100644 --- a/loader2/cdinstall.h +++ b/loader2/cdinstall.h @@ -8,7 +8,7 @@ char * mountCdromImage(struct installMethod * method, moduleInfoSet modInfo, moduleList modLoaded, moduleDeps * modDepsPtr, int flags); -char * findRedHatCD(char * location, +char * findAnacondaCD(char * location, moduleInfoSet modInfo, moduleList modLoaded, moduleDeps modDeps, diff --git a/loader2/loader.c b/loader2/loader.c index e8428da08..6e61efbd1 100644 --- a/loader2/loader.c +++ b/loader2/loader.c @@ -767,7 +767,7 @@ static char *doLoaderMain(char * location, * we can fast-path the CD and not make people answer questions in * text mode. */ if (!FL_ASKMETHOD(flags) && !FL_KICKSTART(flags)) { - url = findRedHatCD(location, modInfo, modLoaded, * modDepsPtr, flags, !FL_RESCUE(flags)); + url = findAnacondaCD(location, modInfo, modLoaded, * modDepsPtr, flags, !FL_RESCUE(flags)); /* if we found a CD and we're not in rescue or vnc mode return */ /* so we can short circuit straight to stage 2 from CD */ if (url && (!FL_RESCUE(flags) && !hasGraphicalOverride())) diff --git a/loader2/urlinstall.c b/loader2/urlinstall.c index b77d8d2a8..d604ce478 100644 --- a/loader2/urlinstall.c +++ b/loader2/urlinstall.c @@ -268,7 +268,7 @@ char * mountUrlImage(struct installMethod * method, /* ok messy - see if we have a stage2 on local CD */ /* before trying to pull one over network */ - cdurl = findRedHatCD(location, modInfo, modLoaded, + cdurl = findAnacondaCD(location, modInfo, modLoaded, *modDeps, flags, 0); if (cdurl && (loadSingleUrlImage(&ui, "base/hdlist", flags, NULL, |