diff options
| -rw-r--r-- | ChangeLog | 11 | ||||
| -rw-r--r-- | docs/command-line.txt | 4 | ||||
| -rw-r--r-- | loader2/loader.c | 22 | ||||
| -rw-r--r-- | loader2/loader.h | 1 |
4 files changed, 35 insertions, 3 deletions
@@ -1,3 +1,14 @@ +2005-10-21 Chris Lumens <clumens@redhat.com> + + * scripts/upd-instroot: Add email.* modules. Remove directories we + don't care about. + + * docs/command-line.txt: Document new updates= behavior. + * loader2/loader.h: Add updatessrc to the loaderData. + * loader2/loader.c (loadUpdatesFromRemote): Retrieve updates.img from + a remote machine. + (parseCmdLineFlags): Handle new updates= behavior. + 2005-10-20 Jeremy Katz <katzj@redhat.com> * splashscreen.py (splashScreenShow): Don't do xsetroot anymore. diff --git a/docs/command-line.txt b/docs/command-line.txt index 14ad2b8d2..70b6e6fd7 100644 --- a/docs/command-line.txt +++ b/docs/command-line.txt @@ -60,6 +60,10 @@ vncconnect=<host>[:<port>] Once installation is up and running, connect to updates Prompt for floppy containing updates (bug fixes). +updates=ftp://<path> Image containing updates over FTP. + +updates=http://<path> Image containing updates over HTTP. + isa Prompt user for ISA devices configuration. dd Use a driver disk. diff --git a/loader2/loader.c b/loader2/loader.c index ecd1b262c..5a61c48f7 100644 --- a/loader2/loader.c +++ b/loader2/loader.c @@ -340,6 +340,18 @@ void loadUpdates(int flags) { return; } +static int loadUpdatesFromRemote(char * url, struct loaderData_s * loaderData, + int flags) { + int rc = getFileFromUrl(url, "/tmp/updates.img", loaderData, flags); + + if (rc != 0) + return rc; + + copyUpdatesImg("/tmp/updates.img"); + unlink("/tmp/updates.img"); + return 0; +} + static void checkForHardDrives(int * flagsPtr) { int flags = (*flagsPtr); int i; @@ -547,7 +559,9 @@ static int parseCmdLineFlags(int flags, struct loaderData_s * loaderData, flags |= LOADER_FLAGS_GRAPHICAL; else if (!strcasecmp(argv[i], "cmdline")) flags |= LOADER_FLAGS_CMDLINE; - else if (!strcasecmp(argv[i], "updates")) + else if (!strncasecmp(argv[i], "updates=", 8)) + loaderData->updatessrc = strdup(argv[i] + 8); + else if (!strncasecmp(argv[i], "updates", 7)) flags |= LOADER_FLAGS_UPDATES; else if (!strcasecmp(argv[i], "isa")) flags |= LOADER_FLAGS_ISA; @@ -1395,8 +1409,10 @@ int main(int argc, char ** argv) { startNewt(flags); manualDeviceCheck(modInfo, modLoaded, &modDeps, flags); } - - if (FL_UPDATES(flags)) + + if (loaderData.updatessrc) + loadUpdatesFromRemote(loaderData.updatessrc, &loaderData, flags); + else if (FL_UPDATES(flags)) loadUpdates(flags); mlLoadModuleSet("md:raid0:raid1:raid5:raid6:fat:msdos:jbd:ext3:reiserfs:jfs:xfs:dm-mod:dm-zero:dm-mirror:dm-snapshot", modLoaded, modDeps, modInfo, flags); diff --git a/loader2/loader.h b/loader2/loader.h index f6ac52b36..7f1312680 100644 --- a/loader2/loader.h +++ b/loader2/loader.h @@ -102,6 +102,7 @@ struct loaderData_s { char * ddsrc; void * methodData; char * logLevel; + char * updatessrc; moduleList modLoaded; moduleDeps * modDepsPtr; |