summaryrefslogtreecommitdiffstats
path: root/loader2/hardware.c
diff options
context:
space:
mode:
authorJeremy Katz <katzj@redhat.com>2003-07-08 03:00:53 +0000
committerJeremy Katz <katzj@redhat.com>2003-07-08 03:00:53 +0000
commit459119c94529602d08de465b7ebfa4871d328081 (patch)
tree369a7eb643938d6d51ef6f2d0c46561e61dcc0ae /loader2/hardware.c
parent390977d3ee0ebc010168ce04573f63ae15458718 (diff)
downloadanaconda-459119c94529602d08de465b7ebfa4871d328081.tar.gz
anaconda-459119c94529602d08de465b7ebfa4871d328081.tar.xz
anaconda-459119c94529602d08de465b7ebfa4871d328081.zip
massive merge from taroon branch. changes are all over the place, but a
summary of looking through the diff is * clean up warnings, we build with -Wall -Werror here too * product.img stuff * max logical partitions enforcement * 1 TB max fs size * ethtool stuff * autopart in kickstart * driver disk fixes * RHEL upgrade stuff * network driver disks * variant pkgorder/tree splitting
Diffstat (limited to 'loader2/hardware.c')
-rw-r--r--loader2/hardware.c23
1 files changed, 5 insertions, 18 deletions
diff --git a/loader2/hardware.c b/loader2/hardware.c
index 24e6d2381..633baf346 100644
--- a/loader2/hardware.c
+++ b/loader2/hardware.c
@@ -285,7 +285,7 @@ void dasdSetup(moduleList modLoaded, moduleDeps modDeps,
return;
#else
char **dasd_parms;
- char *line, *ports = NULL;
+ char *line;
char *parms = NULL, *parms_end;
FILE *fd;
@@ -322,24 +322,11 @@ void dasdSetup(moduleList modLoaded, moduleDeps modDeps,
return;
}
if(!parms) {
- mlLoadModuleSet("dasd_mod:dasd_diag_mod:dasd_fba_mod:dasd_eckd_mod",
+ dasd_parms[0] = "dasd=autodetect";
+ mlLoadModule("dasd_mod", modLoaded, modDeps, modInfo, dasd_parms, flags);
+ mlLoadModuleSet("dasd_diag_mod:dasd_fba_mod:dasd_eckd_mod",
modLoaded, modDeps, modInfo, flags);
- if((ports = getDasdPorts())) {
- parms = (char *)malloc(strlen("dasd=") + strlen(ports) + 1);
- strcpy(parms,"dasd=");
- strcat(parms, ports);
- dasd_parms[0] = parms;
- removeLoadedModule("dasd_eckd_mod", modLoaded, flags);
- removeLoadedModule("dasd_fba_mod", modLoaded, flags);
- removeLoadedModule("dasd_diag_mod", modLoaded, flags);
- removeLoadedModule("dasd_mod", modLoaded, flags);
- mlLoadModule("dasd_mod", modLoaded, modDeps, modInfo,
- dasd_parms, flags);
- mlLoadModuleSet("dasd_diag_mod:dasd_fba_mod:dasd_eckd_mod",
- modLoaded, modDeps, modInfo, flags);
- free(dasd_parms);
- free(ports);
- }
+ free(dasd_parms);
}
#endif
}