summaryrefslogtreecommitdiffstats
path: root/loader2/hdinstall.c
diff options
context:
space:
mode:
authorJeremy Katz <katzj@redhat.com>2003-11-22 00:12:14 +0000
committerJeremy Katz <katzj@redhat.com>2003-11-22 00:12:14 +0000
commit91e7edf0bfe395d7a39e18a4bac56a98f9f59266 (patch)
treed4b16e3f496f5f094c3f426e5f58899f70166fe8 /loader2/hdinstall.c
parent2eb8babb2d31a6ca7716a9108aeed29ed06f2b63 (diff)
downloadanaconda-91e7edf0bfe395d7a39e18a4bac56a98f9f59266.tar.gz
anaconda-91e7edf0bfe395d7a39e18a4bac56a98f9f59266.tar.xz
anaconda-91e7edf0bfe395d7a39e18a4bac56a98f9f59266.zip
switch to using kudzu's probeDevices() instead of the isys knownDevices
list everywhere. stop passing around kd. link with libpci_loader (built with diet) on diet arches to avoid dirent incompatibilities
Diffstat (limited to 'loader2/hdinstall.c')
-rw-r--r--loader2/hdinstall.c11
1 files changed, 4 insertions, 7 deletions
diff --git a/loader2/hdinstall.c b/loader2/hdinstall.c
index ad1d93a46..875d611c2 100644
--- a/loader2/hdinstall.c
+++ b/loader2/hdinstall.c
@@ -37,7 +37,6 @@
#include "method.h"
#include "mediacheck.h"
-#include "../isys/probe.h"
#include "../isys/imount.h"
#include "../isys/isys.h"
@@ -388,8 +387,7 @@ static char * setupIsoImages(char * device, char * dirName, int flags) {
* ISO images on that filesystem
*/
char * mountHardDrive(struct installMethod * method,
- char * location, struct knownDevices * kd,
- struct loaderData_s * loaderData,
+ char * location, struct loaderData_s * loaderData,
moduleInfoSet modInfo, moduleList modLoaded,
moduleDeps * modDepsPtr, int flags) {
int rc;
@@ -469,7 +467,7 @@ char * mountHardDrive(struct installMethod * method,
return NULL;
rc = loadDriverFromMedia(CLASS_HD, modLoaded, modDepsPtr,
- modInfo, kd, flags, 0, 0);
+ modInfo, flags, 0, 0);
if (rc == LOADER_BACK)
return NULL;
@@ -555,7 +553,7 @@ char * mountHardDrive(struct installMethod * method,
return NULL;
} else if (es.reason == NEWT_EXIT_HOTKEY && es.u.key == NEWT_KEY_F2) {
rc = loadDriverFromMedia(CLASS_HD, modLoaded, modDepsPtr,
- modInfo, kd, flags, 0, 0);
+ modInfo, flags, 0, 0);
if (rc == LOADER_BACK)
return NULL;
@@ -583,8 +581,7 @@ char * mountHardDrive(struct installMethod * method,
return url;
}
-void setKickstartHD(struct knownDevices * kd,
- struct loaderData_s * loaderData, int argc,
+void setKickstartHD(struct loaderData_s * loaderData, int argc,
char ** argv, int * flagsPtr) {
char *partition, *dir;
poptContext optCon;