From 7297fbf22a151212631a1e5950ff57f4c6d7969d Mon Sep 17 00:00:00 2001 From: Jeremy Katz Date: Thu, 20 Oct 2005 21:18:54 +0000 Subject: 2005-10-20 Jeremy Katz * anaconda.spec: Bump version. --- ChangeLog | 11 +++++++++++ loader2/hardware.c | 7 +------ loader2/loader.c | 22 +--------------------- loader2/modules.c | 10 ---------- loader2/modules.h | 6 ------ loader2/usb.c | 4 +--- 6 files changed, 14 insertions(+), 46 deletions(-) diff --git a/ChangeLog b/ChangeLog index 49ed1fda4..8a3f0d20a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,6 +2,17 @@ * anaconda.spec: Bump version. + * loader2/loader.c: Second stage module location no longer exists, + stop trying to use it. + * loader2/usb.c (usbInitializeMouse): Likewise. + * loader2/hardware.c (scsiTapeInitialize): Likewise. + * loader2/modules.c (mlLoadModuleSetLocation): Remove. + * loader2/modules.h (mlLoadModuleSetLocation): Likewise. + +2005-10-20 Jeremy Katz + + * anaconda.spec: Bump version. + * loader2/urlinstall.c (loadUrlImages): minstg2.img instead of netstg2.img * loader2/hdinstall.c (mountHDImages): minstg2.img instead of diff --git a/loader2/hardware.c b/loader2/hardware.c index aa949b86c..351597129 100644 --- a/loader2/hardware.c +++ b/loader2/hardware.c @@ -37,9 +37,6 @@ #include "../isys/isys.h" -/* JKFIXME: this is the same hack as in loader.c for second stage modules */ -extern struct moduleBallLocation * secondStageModuleLocation; - /* returns whether or not we can probe devices automatically or have to * ask for them manually. */ int canProbeDevices(void) { @@ -147,9 +144,7 @@ int scsiTapeInitialize(moduleList modLoaded, moduleDeps modDeps, logMessage(INFO, "scsi tape device(s) found, loading st.ko"); - if (mlLoadModuleSetLocation("st", modLoaded, modDeps, - modInfo, flags, - secondStageModuleLocation)) { + if (mlLoadModuleSet("st", modLoaded, modDeps, modInfo, flags)) { logMessage(ERROR, "failed to insert st module"); return 1; } diff --git a/loader2/loader.c b/loader2/loader.c index 2c3bc75b0..ecd1b262c 100644 --- a/loader2/loader.c +++ b/loader2/loader.c @@ -114,9 +114,6 @@ static struct installMethod installMethods[] = { }; static int numMethods = sizeof(installMethods) / sizeof(struct installMethod); -/* JKFIXME: bad hack for second stage modules without module-info */ -struct moduleBallLocation * secondStageModuleLocation; - void setupRamfs(void) { mkdirChain("/tmp/ramfs"); doPwMount("none", "/tmp/ramfs", "ramfs", 0, NULL); @@ -1177,11 +1174,6 @@ int main(int argc, char ** argv) { /* Make sure sort order is right. */ setenv ("LC_COLLATE", "C", 1); - /* JKFIXME: very very bad hack */ - secondStageModuleLocation = malloc(sizeof(struct moduleBallLocation)); - secondStageModuleLocation->path = strdup("/mnt/runtime/modules/modules.cgz"); - secondStageModuleLocation->version = CURRENT_MODBALLVER; - if (!strcmp(argv[0] + strlen(argv[0]) - 6, "insmod")) return ourInsmodCommand(argc, argv); if (!strcmp(argv[0] + strlen(argv[0]) - 8, "modprobe")) @@ -1388,16 +1380,6 @@ int main(int argc, char ** argv) { spawnShell(flags); /* we can attach gdb now :-) */ - /* setup the second stage modules; don't over-ride any already existing - * modules because that would be rude - */ - { - mlLoadDeps(&modDeps, "/mnt/runtime/modules/modules.dep"); - pciReadDrivers("/mnt/runtime/modules/modules.alias"); - readModuleInfo("/mnt/runtime/modules/module-info", modInfo, - secondStageModuleLocation, 0); - } - /* JKFIXME: kickstart devices crap... probably kind of bogus now though */ @@ -1417,9 +1399,7 @@ int main(int argc, char ** argv) { if (FL_UPDATES(flags)) loadUpdates(flags); - mlLoadModuleSetLocation("md:raid0:raid1:raid5:raid6:fat:msdos:jbd:ext3:reiserfs:jfs:xfs:dm-mod:dm-zero:dm-mirror:dm-snapshot", - modLoaded, modDeps, modInfo, flags, - secondStageModuleLocation); + 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); usbInitializeMouse(modLoaded, modDeps, modInfo, flags); diff --git a/loader2/modules.c b/loader2/modules.c index d86070631..1db4ba73c 100644 --- a/loader2/modules.c +++ b/loader2/modules.c @@ -623,16 +623,6 @@ int mlLoadModuleSet(const char * modNames, flags, NULL, NULL, NULL); } -/* like mlLoadModuleSet but from an explicit location */ -/* JKFIXME: this is a hack */ -int mlLoadModuleSetLocation(const char * modNames, - moduleList modLoaded, moduleDeps modDeps, - moduleInfoSet modInfo, int flags, - struct moduleBallLocation * location) { - return doLoadModules(modNames, modLoaded, modDeps, modInfo, - flags, NULL, NULL, location); -} - static int writeModulesConf(moduleList list, int fd) { int i, ret; struct loadedModuleInfo * lm; diff --git a/loader2/modules.h b/loader2/modules.h index 07042db3a..c899b3225 100644 --- a/loader2/modules.h +++ b/loader2/modules.h @@ -34,12 +34,6 @@ int mlLoadModule(const char * module, moduleList modLoaded, int mlLoadModuleSet(const char * modNames, moduleList modLoaded, moduleDeps modDeps, moduleInfoSet modInfo, int flags); -/* like mlLoadModuleSet but from an explicit location */ -/* JKFIXME: this is a hack */ -int mlLoadModuleSetLocation(const char * modNames, - moduleList modLoaded, moduleDeps modDeps, - moduleInfoSet modInfo, int flags, - struct moduleBallLocation * location); int mlModuleInList(const char * modName, moduleList list); void writeScsiDisks(moduleList list); diff --git a/loader2/usb.c b/loader2/usb.c index 4004d2120..5bdc89de3 100644 --- a/loader2/usb.c +++ b/loader2/usb.c @@ -130,8 +130,6 @@ int usbInitialize(moduleList modLoaded, moduleDeps modDeps, void usbInitializeMouse(moduleList modLoaded, moduleDeps modDeps, moduleInfoSet modInfo, int flags) { - extern struct moduleBallLocation * secondStageModuleLocation; - if (FL_NOUSB(flags)) return; if (access("/proc/bus/usb/devices", R_OK)) return; @@ -139,7 +137,7 @@ void usbInitializeMouse(moduleList modLoaded, moduleDeps modDeps, logMessage(INFO, "looking for USB mouse..."); if (probeDevices(CLASS_MOUSE, BUS_USB, PROBE_ALL)) { logMessage(INFO, "USB mouse found, loading mousedev module"); - if (mlLoadModuleSetLocation("mousedev", modLoaded, modDeps, modInfo, flags, secondStageModuleLocation)) { + if (mlLoadModuleSet("mousedev", modLoaded, modDeps, modInfo, flags)) { logMessage (ERROR, "failed to loading mousedev module"); return; } -- cgit