remove old loader dir. for referencing, go back to anaconda-8-0-branch

1 files changed, 0 insertions, 881 deletions

diff --git a/loader/modules.c b/loader/modules.c
deleted file mode 100644
index ccacfe574..000000000
--- a/loader/modules.c
+++ /dev/null
@@ -1,881 +0,0 @@
-#include <alloca.h>
-#include <ctype.h>
-#include <errno.h>
-#include <fcntl.h>
-#include <newt.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <sys/mount.h>
-#include <sys/stat.h>
-#include <sys/utsname.h>
-#include <sys/wait.h>
-#include <unistd.h>
-
-#include "isys/imount.h"
-#include "isys/isys.h"
-#include "isys/cpio.h"
-
-#include "lang.h"
-#include "loader.h"
-#include "log.h"
-#include "misc.h"
-#include "modules.h"
-#include "moduledeps.h"
-#include "devices.h"
-#include "windows.h"
-#include "stubs.h"
-
-static int ethCount(void);
-static int scsiCount(void);
-int mlReadLoadedList(moduleList * mlp);
-void mlFreeList(moduleList ml);
-char ** tsortModules(moduleList modLoaded, moduleDeps ml, char ** args, 
-			    int depth, char *** listPtr, int * listSizePtr);
-static int loadModule(const char * modName, struct extractedModule * path, 
-		      moduleList modLoaded, char ** args, 
-		      moduleInfoSet modInfo, int flags);
-static char * filterDriverModules(struct driverDiskInfo * ddi,
-				  char * const * modNames);
-static struct extractedModule * extractModules (struct driverDiskInfo * ddi, 
-		char * const * modNames, struct extractedModule * oldPaths);
-static int doLoadModules(const char * origModNames, moduleList modLoaded, 
-		    moduleDeps modDeps, moduleInfoSet modInfo, int flags,
-		    const char * argModule, char ** args);
-int mlLoadModule(const char * modName, 
-		    moduleList modLoaded, moduleDeps modDeps, char ** args, 
-		    moduleInfoSet modInfo, int flags);
-int mlLoadModuleSet(const char * modNames, 
-		    moduleList modLoaded, moduleDeps modDeps, 
-		    moduleInfoSet modInfo, int flags);
-int mlModuleInList(const char * modName, moduleList list);
-int mlWriteConfModules(moduleList list, int fd);
-int simpleRemoveLoadedModule(const char * modName, moduleList modLoaded,
-			     int flags);
-int reloadUnloadedModule(char * modName, void * location,
-			 moduleList modLoaded, char ** args, int flags);
-
-static int ethCount(void) {
-    int fd;
-    char buf[16384];
-    int i;
-    char * chptr;
-    int count = 0;
-
-    fd = open("/proc/net/dev", O_RDONLY);
-    i = read(fd, buf, sizeof(buf) - 1);
-    buf[i] = '\0';
-
-    /* skip first two header lines */
-    chptr = strchr(buf, '\n') + 1;
-    chptr = strchr(chptr, '\n') + 1;
-
-    while (chptr) {
-	while (*chptr && isspace(*chptr)) chptr++;
-	if (!strncmp(chptr, "eth", 3))
-	    count++;
-	chptr = strchr(chptr, '\n');
-	if (chptr) chptr++;
-    }
-
-    return count;
-}
-
-static int scsiCount(void) {
-    FILE *f;
-    char buf[16384];
-    int count = 0;
-
-    f = fopen("/tmp/modules.conf", "r");
-    if (!f)
-	return 0;
-    while (fgets(buf, sizeof(buf) - 1, f)) {
-	if (!strncmp(buf, "alias scsi_hostadapter", 22))
-	    count++;
-    }
-    fclose(f);
-    return count;
-}
-
-int mlReadLoadedList(moduleList * mlp) {
-    int fd;
-    char * start;
-    char * end;
-    char buf[4096];
-    struct stat sb;
-    int i;
-    moduleList ml;
-
-    if ((fd = open("/proc/modules", O_RDONLY)) < 0)
-    	return -1;
-
-    fstat(fd, &sb);
-    i = read(fd, buf, sizeof(buf));
-    buf[i] = '\0';
-    close(fd);
-
-    ml = malloc(sizeof(*ml));
-    ml->numModules = 0;
-
-    start = buf;
-    while (start && *start) {
-    	end = start;
-	while (!isspace(*end) && *end != '\n') end++;
-	*end = '\0';
-	ml->mods[ml->numModules].name = strdup(start);
-	ml->mods[ml->numModules].args = NULL;
-	ml->mods[ml->numModules].path = NULL;
-	ml->mods[ml->numModules].weLoaded = 0;
-	*end = ' ';
-	/*ml->numModules++;*/
-	start = strchr(end, '\n');
-	if (start) start++;
-    }
-
-    *mlp = ml;
-
-    return 0;
-}
-
-void mlFreeList(moduleList ml) {
-    int i;
-    int j;
-
-    for (i = 0; i < ml->numModules; i++) {
-        free(ml->mods[i].name);
-	if (ml->mods[i].args) {
-	    for (j = 0; ml->mods[j].args[j]; j++)
-		free(ml->mods[i].args[j]);
-	    free(ml->mods[i].args);
-	}
-    }
-    free(ml);
-}
-
-/* this leaks memory if their is a loop in the modules. oh well. */
-char ** tsortModules(moduleList modLoaded, moduleDeps ml, char ** args, 
-			    int depth, char *** listPtr, int * listSizePtr) {
-    int listSize;
-    char ** list;
-    char ** next;
-    char ** deps;
-
-    if (!depth) {
-	int count;
-
-	listSize = 5;
-	list = malloc((listSize + 1) * sizeof(*list));
-	*list = NULL;
-
-	listPtr = &list;
-	listSizePtr = &listSize;
-
-	for (deps = args, count = 0; *deps; deps++, count++);
-    } else {
-	list = *listPtr;
-	listSize = *listSizePtr;
-    }
-
-    if (depth++ > 100) {
-	return NULL;
-    }
-
-    while (*args) {
-	/* don't load it twice */
-	next = list;
-	while (*next && strcmp(*next, *args)) next++;
-
-	if (*next || mlModuleInList(*args, modLoaded)) {
-	    args++;
-	    continue;
-	}
-
-	/* load everything this depends on */
-	deps = mlGetDeps(ml, *args);
-	if (deps) {
-	    if (!tsortModules(modLoaded, ml, deps, depth, listPtr, listSizePtr))
-		return NULL;
-
-	    list = *listPtr;
-	    listSize = *listSizePtr;
-	}	    
-
-	/* add this to the list */
-	next = list;
-	while (*next) next++;
-
-	if ((next - list) >= listSize) {
-	    int count = next - list;
-
-	    listSize += 10;
-	    /* leave room for a NULL */
-	    list = realloc(list, sizeof(*list) * (listSize + 1));
-
-	    *listSizePtr = listSize;
-	    *listPtr = list;
-
-	    next = list + count;
-	}
-
-	next[0] = *args;
-	next[1] = NULL;
-
-	args++;
-    }
-
-    return list;
-}
-
-static int loadModule(const char * modName, struct extractedModule * path, 
-		      moduleList modLoaded, char ** args, 
-		      moduleInfoSet modInfo, int flags) {
-    char fileName[200];
-    int rc, i;
-    char ** arg, ** newArgs, ** argPtr;
-    struct moduleInfo * mi = NULL;
-    int ethDevices = -1;
-    pid_t child;
-    int status;
-    int popWindow = 0;
-
-    if (mlModuleInList(modName, modLoaded))
-	return 0;
-
-    if (modInfo && (mi = isysFindModuleInfo(modInfo, modName))) {
-	if (mi->major == DRIVER_NET && mi->minor == DRIVER_MINOR_ETHERNET) {
-	    ethDevices = ethCount();
-	}
-
-	if (mi->major == DRIVER_SCSI) {
-	    startNewt(flags);
-	    scsiWindow(modName);
-	    popWindow = 1;
-	}
-    }
-
-    sprintf(fileName, "%s.o", modName);
-    for (argPtr = args; argPtr && *argPtr; argPtr++)  {
-	strcat(fileName, " ");
-	strcat(fileName, *argPtr);
-    }
-
-    if (modInfo && (mi = isysFindModuleInfo(modInfo, modName))) {
-	if (mi->major == DRIVER_SCSI) {
-	    /* XXX this shouldn't happen before every load but instead
-	     * just before loading a module group */
-	    simpleRemoveLoadedModule("usb-storage", modLoaded, flags);
-	}
-    }
-
-    if (FL_TESTING(flags)) {
-	logMessage("would have insmod %s", path);
-	rc = 0;
-    } else {
-	if (!(child = fork())) {
-	    int fd = open("/dev/tty3", O_RDWR);
-
-	    dup2(fd, 0);
-	    dup2(fd, 1);
-	    dup2(fd, 2);
-	    close(fd);
-
-	    rc = insmod(path->path, NULL, args);
-	    _exit(rc);
-	}
-
-	waitpid(child, &status, 0);
-
-	if (!WIFEXITED(status) || WEXITSTATUS(status)) {
-	    rc = 1;
-	} else {
-	    rc = 0;
-	}
-    }
-
-    if (modInfo && (strncmp(modName, "usb-storage", 11) != 0) && (mi = isysFindModuleInfo(modInfo, modName))) {
- 	if (mi->major == DRIVER_SCSI) {
- 	    reloadUnloadedModule("usb-storage", NULL, modLoaded, NULL, flags);
-	    setFloppyDevice(flags);
- 	}
-    }
-
-    if (!rc) {
-	modLoaded->mods[modLoaded->numModules].name = strdup(modName);
-	modLoaded->mods[modLoaded->numModules].weLoaded = 1;
-	modLoaded->mods[modLoaded->numModules].path = 
-	    path->location ? strdup(path->location) : NULL;
-	modLoaded->mods[modLoaded->numModules].firstDevNum = -1;
-	modLoaded->mods[modLoaded->numModules].lastDevNum = -1;
-	modLoaded->mods[modLoaded->numModules].written = 0;
-	
-	if (ethDevices >= 0) {
-	    modLoaded->mods[modLoaded->numModules].firstDevNum = ethDevices;
-	    modLoaded->mods[modLoaded->numModules].lastDevNum = ethCount() - 1;
-	}
-
-	if (mi) {
-	    modLoaded->mods[modLoaded->numModules].major = mi->major;
-	    modLoaded->mods[modLoaded->numModules].minor = mi->minor;
-	} else {
-	    modLoaded->mods[modLoaded->numModules].major = DRIVER_NONE;
-	    modLoaded->mods[modLoaded->numModules].minor = DRIVER_MINOR_NONE;
-	}
-
-	if (args) {
-	    for (i = 0, arg = args; *arg; arg++, i++);
-	    newArgs = malloc(sizeof(*newArgs) * (i + 1));
-	    for (i = 0, arg = args; *arg; arg++, i++)
-		newArgs[i] = strdup(*arg);
-	    newArgs[i] = NULL;
-	} else {
-	    newArgs = NULL;
-	}
-
-	modLoaded->mods[modLoaded->numModules++].args = newArgs;
-    }
-
-    if (popWindow) {
-	sleep(1);
-	newtPopWindow();
-    }
-
-    return rc;
-}
-
-static char * filterDriverModules(struct driverDiskInfo * ddi,
-				  char * const * modNames) {
-    struct utsname un;
-    gzFile from;
-    gzFile to;
-    int first = 1;
-    int fd;
-    char * buf;
-    struct stat sb;
-    int rc;
-    int failed;
-    char * toPath;
-    char * chptr;
-    char ** pattern, ** p;
-    int i;
-
-    uname(&un);
-    /* strip off BOOT, -SMP, whatever */
-    chptr = un.release + strlen(un.release) - 1;
-    while (!isdigit(*chptr)) chptr--;
-    *(chptr + 1) = '\0';
-
-    for (i = 0; modNames[i]; i++) ;
-    pattern = alloca((i + 1) * sizeof(*pattern));
-
-    for (i = 0, p = pattern; modNames[i]; i++, p++) {
-	*p = alloca(strlen(modNames[i]) + strlen(un.release) + 5);
-	sprintf(*p, "%s*/%s.o", un.release, modNames[i]);
-	logMessage("extracting pattern %s%s%s", *p,
-		    ddi->title ? " from " : "",
-		    ddi->title ? ddi->title : "");
-    }
-    *p = NULL;
-
-    if (ddi->device)
-	devMakeInode(ddi->device, ddi->mntDevice);
-
-    while (1) {
-	failed = 0;
-
-	if (doPwMount(ddi->mntDevice, "/tmp/drivers", ddi->fs, 1, 0, 
-		      NULL, NULL))
-	    failed = 1;
-
-	if (failed && !first) {
-	    newtWinMessage(_("Error"), _("OK"), 
-		    _("Failed to mount driver disk: %s."), strerror(errno));
-	} else if (!failed) {
-	    if ((fd = open("/tmp/drivers/rhdd-6.1", O_RDONLY)) < 0)
-		failed = 1;
-	    if (!failed) {
-		fstat(fd, &sb);
-		buf = malloc(sb.st_size + 1);
-		read(fd, buf, sb.st_size);
-		if (buf[sb.st_size - 1] == '\n')
-		    sb.st_size--;
-		buf[sb.st_size] = '\0';
-		close(fd);
-
-		failed = strcmp(buf, ddi->title);
-		free(buf);
-	    }
-
-	    if (failed && !first) {
-		umount("/tmp/drivers");
-		newtWinMessage(_("Error"), _("OK"),
-			_("The wrong diskette was inserted."));
-	    }
-	}
-
-	if (!failed) {
-	    from = gunzip_open("/tmp/drivers/modules.cgz");
-	    toPath = malloc(strlen(modNames[0]) + 30);
-	    sprintf(toPath, "/tmp/modules/%s", modNames[0]);
-	    mkdirChain(toPath);
-	    strcat(toPath, "/modules.cgz");
-	    to = gzip_open(toPath, O_TRUNC | O_RDWR | O_CREAT, 0600);
-
-	    /* This message isn't good, but it'll do. */
-	    winStatus(50, 3, _("Loading"), _("Loading %s driver..."), 
-		      modNames[0]);
-
-	    myCpioFilterArchive(from, to, pattern);
-
-	    gunzip_close(from);
-	    gunzip_close(to);
-	    while(1) {
-		int rc;
-		extern int errno;
-
-		rc = umount("/tmp/drivers");
-		if ((rc != -1) || (errno != -EBUSY))
-		    break;
-	    }
-
-	    newtPopWindow();
-
-	    return toPath;
-	}
-
-	first = 0;
-
-	if (ddi->device)
-	    eject(ddi->device);
-
-	rc = newtWinChoice(_("Driver Disk"), _("OK"), _("Cancel"),
-		_("Please insert the %s driver disk now."), ddi->title);
-	if (rc == 2) return NULL;
-    }
-}
-
-static struct extractedModule * extractModules (struct driverDiskInfo * ddi, 
-		char * const * modNames, struct extractedModule * oldPaths) {
-    gzFile fd;
-    char * ballPath;
-    struct cpioFileMapping * map;
-    int i, numMaps;
-    char * const * m;
-    struct utsname u;
-    int rc;
-    const char * failedFile;
-    char fn[255];
-    struct stat sb;
-
-    /* this needs to know about modules64.cgz for sparc */
-
-    uname(&u);
-
-    if (ddi) {
-	logMessage("looking for drivers on driver disk");
-	ballPath = filterDriverModules(ddi, modNames);
-    } else {
-	ballPath = strdup("/modules/modules.cgz");
-    }
-
-    fd = gunzip_open(ballPath);
-    if (!fd) {
-	logMessage("failed to open %s", ballPath);
-	free(ballPath);
-	return NULL;
-    }
-
-    for (m = modNames, i = 0; *m; i++, m++);
-    
-    map = alloca(sizeof(*map) * i);
-    memset(map, 0, sizeof(*map) * i);
-    if (!oldPaths)
-	/* +1 NULL terminates this list */
-	oldPaths = calloc(i + 1, sizeof(*oldPaths));
-
-    for (m = modNames, i = 0, numMaps = 0; *m; m++, i++) {
-	if (!oldPaths[i].path) {
-	    map[numMaps].archivePath = alloca(strlen(u.release) + 
-						strlen(*m) + 25);
-	    sprintf(map[numMaps].archivePath, "%s/%s.o", u.release, *m);
-	    map[numMaps].fsPath = alloca(10 + strlen(*m));
-	    sprintf(map[numMaps].fsPath, "/tmp/%s.o", *m);
-	    unlink(map[numMaps].fsPath);
-	    map[numMaps].mapFlags = CPIO_MAP_PATH;
-	    numMaps++;
-	}
-    }
-
-    /* nothing to do */
-    if (!numMaps) {
-	gunzip_close(fd);
-	free(ballPath);
-	return oldPaths;
-    }
-
-    qsort(map, numMaps, sizeof(*map), myCpioFileMapCmp);
-    rc = myCpioInstallArchive(fd, map, numMaps, NULL, NULL, &failedFile);
-
-    gunzip_close(fd);
-
-    for (m = modNames, i = 0, numMaps = 0; *m; m++, i++) {
-	if (!oldPaths[i].path) {
-	    /* can't trust map; the order changed thanks to qsort */
-	    sprintf(fn, "/tmp/%s.o", modNames[i]);
-	    if (!stat(fn, &sb)) {
-		if (ddi)
-		    logMessage("module %s found on driver disk %s (%d bytes)", 
-				modNames[i], ddi->title, sb.st_size);
-		oldPaths[i].path = strdup(fn);
-		/* null otherwise from calloc() */
-		if (ddi)
-		    oldPaths[i].location = strdup(ballPath);
-	    }
-	    numMaps++;
-	}
-    }
-
-    free(ballPath);
-    return oldPaths;
-}
-
-static int doLoadModules(const char * origModNames, moduleList modLoaded, 
-		    moduleDeps modDeps, moduleInfoSet modInfo, int flags,
-		    const char * argModule, char ** args) {
-    char * modNames;
-    char * end, * start, * next;
-    char ** initialList;
-    int i;
-    char ** list, ** l;
-    struct extractedModule * paths, * p;
-    struct moduleInfo * mi;
-    char items[1024] = "";
-
-    start = modNames = alloca(strlen(origModNames) + 1);
-    strcpy(modNames, origModNames);
-
-    next = start, i = 1;
-    while (*next) {
-	if (*next == ':') i++;
-	next++;
-    }
-
-    initialList = alloca(sizeof(*initialList) * (i + 1));
-
-    i = 0;
-    while (start) {
-	next = end = strchr(start, ':');
-	if (next) *end = '\0', next++;
-
-	if (mlModuleInList(start, modLoaded)) {
-	    /* already loaded */
-	    start = next;
-	    continue;
-	}
-
-	initialList[i++] = start;
-
-	start = next;
-    }
-    initialList[i] = NULL;
-
-    list = tsortModules(modLoaded, modDeps, initialList, 0, NULL, NULL);
-    if (!list) {
-	logMessage("found loop in module dependencies; not inserting anything");
-	return 1;
-    }
-
-    for (i = 0; list[i]; i++) {
-	strcat(items, " ");
-	strcat(items, list[i]);
-    }
-
-    logMessage("modules to insert%s", items);
-
-    paths = NULL;
-    if (modInfo) {
-	for (i = 0; list[i]; i++) {
-	    if (paths && paths[i].path) continue;
-	    mi = isysFindModuleInfo(modInfo, list[i]);
-
-	    if (mi && mi->locationID)
-		paths = extractModules(mi->locationID, list, paths); 
-	    }
-    }
-
-    paths = extractModules(NULL, list, paths); 
-    i = 0;
-    if (!paths) {
-	logMessage("no modules found -- aborting insertion");
-	return i;
-	i++;
-    } else {
-	*items = '\0';
-
-	/* if any modules weren't found, holler */
-	for (l = list, p = paths; *l && p; l++, p++) {
-	    if (!p->path) {
-		if (*items) strcat(items, " ");
-		strcat(items, *l);
-		i++;
-	    }
-	}
-
-	if (*items) logMessage("module(s) %s not found", items);
-    }
-
-    /* insert the modules now */
-    for (l = list, p = paths; paths && *l; l++, p++) {
-	if (p->path && loadModule(*l, p, modLoaded, 
-		       (argModule && !strcmp(argModule, *l)) ? args : NULL, 
-		       modInfo, flags)) {
-	    logMessage("failed to insert %s", *p);
-	} else if (p->path) {
-	    logMessage("inserted %s", p->path);
-	}
-    }
-
-    if (!FL_TESTING(flags)) {
-	int fd;
-	
-	fd = open("/tmp/modules.conf", O_WRONLY | O_CREAT | O_APPEND,
-		  0666);
-	if (fd == -1) {
-	    logMessage("error appending to /tmp/modules.conf: %s\n", 
-		       strerror(errno));
-	} else {
-	    mlWriteConfModules(modLoaded, fd);
-	    close(fd);
-	}
-    }
-
-    for (p = paths; p->path; p++) {
-	unlink(p->path);
-	free(p->path);
-	if (p->location) free(p->location);
-    }
-
-    free(paths);
-    free(list);
-
-    logMessage("load module set done");
-
-    return i;
-}
-
-/* loads a single module (preloading and dependencies), passing "args" to
-   the module as its argument */
-int mlLoadModule(const char * modName, 
-		    moduleList modLoaded, moduleDeps modDeps, char ** args, 
-		    moduleInfoSet modInfo, int flags) {
-    return doLoadModules(modName, modLoaded, modDeps, modInfo, flags,
-			 modName, args);
-}
-
-/* loads a : separated list of modules. the arg only applies to the
-   first module in the list */
-int mlLoadModuleSet(const char * modNames, 
-		    moduleList modLoaded, moduleDeps modDeps, 
-		    moduleInfoSet modInfo, int flags) {
-    return doLoadModules(modNames, modLoaded, modDeps, modInfo, flags,
-			 NULL, NULL);
-}
-
-int mlModuleInList(const char * modName, moduleList list) {
-    int i;
-
-    if (!list) return 0;
-
-    for (i = 0; i < list->numModules; i++)
-        if (!strcmp(list->mods[i].name, modName)) return 1;
-
-    return 0;
-}
-
-int mlWriteConfModules(moduleList list, int fd) {
-    int i;
-    struct loadedModuleInfo * lm;
-    char buf[16384], buf2[512];
-    int scsiNum;
-    int ethNum;
-    int trNum = 0;
-    int iucvNum = 0;
-    char ** arg;
-    char *iucvopt;
-
-    if (!list) return 0;
-
-    scsiNum = scsiCount();
-    
-    for (i = 0, lm = list->mods; i < list->numModules; i++, lm++) {
-    	if (!lm->weLoaded) continue;
-	if (lm->written) continue;
-	lm->written = 1;
-	if (lm->major != DRIVER_NONE) {
-	    strcpy(buf, "alias ");
-	    switch (lm->major) {
-	      case DRIVER_CDROM:
-		strcat(buf, "cdrom ");
-		break;
-
-	      case DRIVER_SCSI:
-	      	if (scsiNum)
-		    sprintf(buf2, "scsi_hostadapter%d ", scsiNum);
-		else
-		    strcpy(buf2, "scsi_hostadapter ");
-		scsiNum++;
-		strcat(buf, buf2);
-		break;
-
-	      case DRIVER_NET:
-	        switch (lm->minor) {
-		  case DRIVER_MINOR_ETHERNET:
-		      for (ethNum = lm->firstDevNum; 
-				ethNum <= lm->lastDevNum; ethNum++) {
-			  sprintf(buf2, "eth%d ", ethNum);
-			  if (ethNum != lm->lastDevNum) {
-			      strcat(buf2, lm->name);
-			      strcat(buf2, "\nalias ");
-			  }
-			  strcat(buf, buf2);
-			  if(!strstr(lm->name, "iucv"))
-			     iucvNum++;
-		      }
-			  
-		      break;
-		  case DRIVER_MINOR_TR:
-		      sprintf(buf2, "tr%d ", trNum++);
-		      strcat(buf, buf2);
-		      break;
-		  default:
-		}
-
-	      default:
-	    }
-
-	    strcat(buf, lm->name);
-	    strcat(buf, "\n");
-	    write(fd, buf, strlen(buf));
-	}
-
-	if (lm->args) {
-	    strcpy(buf, "options ");
-	    strcat(buf, lm->name);
-	    for (arg = lm->args; *arg; arg++) {
-		strcat(buf, " ");
-		strcat(buf, *arg);
-	    }
-	    strcat(buf, "\n");
-	    write(fd, buf, strlen(buf));
-	}
-    }
-    if (iucvNum) {
-        iucvopt = getenv("IUCV");
-        if (iucvopt && *iucvopt) {
-        sprintf(buf, "options netiucv %s\n", iucvopt);
-        write(fd, buf, strlen(buf));
-	}
-    }
-    return 0;
-}
-
-/* simple removal of a loaded module which is going to be reloaded.
- * Note that this does NOT modify the modLoaded struct at all 
- */
-int simpleRemoveLoadedModule(const char * modName, moduleList modLoaded,
-			     int flags) {
-    int status, rc = 0;
-    pid_t child;
-
-    if (!mlModuleInList(modName, modLoaded)) {
-	return 0;
-    }    
-    
-    if (FL_TESTING(flags)) {
-	logMessage("would have rmmod %s", modName);
-	rc = 0;
-    } else {
-	logMessage("going to rmmod %s", modName);
-	if (!(child = fork())) {
-	    int fd = open("/dev/tty3", O_RDWR);
-
-	    dup2(fd, 0);
-	    dup2(fd, 1);
-	    dup2(fd, 2);
-	    close(fd);
-
-	    execl("/sbin/rmmod", "/sbin/rmmod", modName, NULL);
-	    _exit(rc);
-	}
-
-	waitpid(child, &status, 0);
-	
-	if (!WIFEXITED(status) || WEXITSTATUS(status)) {
-	    rc = 1;
-	} else {
-	    rc = 0;
-	}
-    }
-    return rc;
-}
-
-/* simple reinsertion of a module; just looks for the module and reloads it
- * if we think it was already loaded
- */
-int reloadUnloadedModule(char * modName, void * location,
-			 moduleList modLoaded, char ** args, int flags) {
-    char fileName[200];
-    int rc, status;
-    pid_t child;
-    struct extractedModule * path;
-    char ** argPtr;
-    char * list[2];
-
-    if (!mlModuleInList(modName, modLoaded)) {
-	return 0;
-    }
-
-    list[0] = modName;
-    list[1] = NULL;
-
-    if (location)
-	path = extractModules(location, tsortModules(modLoaded, NULL, list, 0, NULL, NULL), NULL);
-
-    sprintf(fileName, "%s.o", modName);
-    for (argPtr = args; argPtr && *argPtr; argPtr++)  {
-	strcat(fileName, " ");
-	strcat(fileName, *argPtr);
-    }
-
-    sprintf(fileName, "%s.o", modName);
-
-    if (FL_TESTING(flags)) {
-	logMessage("would have insmod %s", fileName);
-	rc = 0;
-    } else {
-	logMessage("going to insmod %s", fileName);
-
-	if (!(child = fork())) {
-	    int fd = open("/dev/tty3", O_RDWR);
-
-	    dup2(fd, 0);
-	    dup2(fd, 1);
-	    dup2(fd, 2);
-	    close(fd);
-
-	    rc = insmod(fileName, NULL, args);
-	    _exit(rc);
-	}
-
-	waitpid(child, &status, 0);
-
-	if (!WIFEXITED(status) || WEXITSTATUS(status)) {
-	    rc = 1;
-	} else {
-	    rc = 0;
-	}
-    }
-
-    logMessage("reloadModule returning %d", rc);
-    return rc;
-}
-