diff options
| author | Karsten Hopp <karsten@redhat.de> | 2003-06-10 13:02:27 +0000 |
|---|---|---|
| committer | Karsten Hopp <karsten@redhat.de> | 2003-06-10 13:02:27 +0000 |
| commit | a08e921ea2e4b0bbbdfedd3a0352f356ba36eaaf (patch) | |
| tree | 14f5b021e02054240123473c47b3474922198db3 | |
| parent | 5881ff799a46f879edc3e89272c15602a2d0c646 (diff) | |
| download | anaconda-a08e921ea2e4b0bbbdfedd3a0352f356ba36eaaf.tar.gz anaconda-a08e921ea2e4b0bbbdfedd3a0352f356ba36eaaf.tar.xz anaconda-a08e921ea2e4b0bbbdfedd3a0352f356ba36eaaf.zip | |
2 errors: old garbage shouldn't get commited, and wtf does it end up in -HEAD ?
| -rw-r--r-- | loader2/hardware.c | 20 |
1 files changed, 0 insertions, 20 deletions
diff --git a/loader2/hardware.c b/loader2/hardware.c index 1070869ab..24e6d2381 100644 --- a/loader2/hardware.c +++ b/loader2/hardware.c @@ -287,9 +287,7 @@ void dasdSetup(moduleList modLoaded, moduleDeps modDeps, char **dasd_parms; char *line, *ports = NULL; char *parms = NULL, *parms_end; - char buf[512]; FILE *fd; - int f; dasd_parms = malloc(sizeof(*dasd_parms) * 2); dasd_parms[0] = NULL; @@ -331,23 +329,6 @@ void dasdSetup(moduleList modLoaded, moduleDeps modDeps, strcpy(parms,"dasd="); strcat(parms, ports); dasd_parms[0] = parms; -<<<<<<< hardware.c - simpleRemoveLoadedModule("dasd_eckd_mod", modLoaded, flags); - simpleRemoveLoadedModule("dasd_fba_mod", modLoaded, flags); - simpleRemoveLoadedModule("dasd_diag_mod", modLoaded, flags); - simpleRemoveLoadedModule("dasd_mod", modLoaded, flags); - reloadUnloadedModule("dasd_mod", modLoaded, dasd_parms, flags); - reloadUnloadedModule("dasd_eckd_mod", modLoaded, NULL, flags); - /* KHFIXME */ - sprintf(buf, "options dasd_mod %s\n", parms); - f = open("/tmp/modules.conf", O_WRONLY | O_CREAT | O_APPEND, 0666); - if (f != -1) { - write(f, buf, strlen(buf)); - close(f); - } - } - -======= removeLoadedModule("dasd_eckd_mod", modLoaded, flags); removeLoadedModule("dasd_fba_mod", modLoaded, flags); removeLoadedModule("dasd_diag_mod", modLoaded, flags); @@ -356,7 +337,6 @@ void dasdSetup(moduleList modLoaded, moduleDeps modDeps, dasd_parms, flags); mlLoadModuleSet("dasd_diag_mod:dasd_fba_mod:dasd_eckd_mod", modLoaded, modDeps, modInfo, flags); ->>>>>>> 1.9.6.8 free(dasd_parms); free(ports); } |