diff options
author | Chris Lumens <clumens@redhat.com> | 2005-10-21 17:49:43 +0000 |
---|---|---|
committer | Chris Lumens <clumens@redhat.com> | 2005-10-21 17:49:43 +0000 |
commit | 6f9e10f5cdd2de285e2640de5d0f2b314a7e1b3f (patch) | |
tree | 0e4d2b47a9d801c876c7cab21c6d02a898cedf5a /loader2 | |
parent | 8fafbf89c3af5ceadfafca1dc9d7d0e6016a4143 (diff) | |
download | anaconda-6f9e10f5cdd2de285e2640de5d0f2b314a7e1b3f.tar.gz anaconda-6f9e10f5cdd2de285e2640de5d0f2b314a7e1b3f.tar.xz anaconda-6f9e10f5cdd2de285e2640de5d0f2b314a7e1b3f.zip |
Support remote updates.img.
Diffstat (limited to 'loader2')
-rw-r--r-- | loader2/loader.c | 22 | ||||
-rw-r--r-- | loader2/loader.h | 1 |
2 files changed, 20 insertions, 3 deletions
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; |