summaryrefslogtreecommitdiffstats
path: root/loader
diff options
context:
space:
mode:
authorErik Troan <ewt@redhat.com>2000-07-12 22:40:32 +0000
committerErik Troan <ewt@redhat.com>2000-07-12 22:40:32 +0000
commit7a18b36030c65279e59ba529aef3a1847a61ff17 (patch)
tree3545f612170ad000b4ae6178cc2fe4c95cd5baf5 /loader
parentcc5e0782ed72243796f8b6f298792f4cd02d57eb (diff)
downloadanaconda-7a18b36030c65279e59ba529aef3a1847a61ff17.tar.gz
anaconda-7a18b36030c65279e59ba529aef3a1847a61ff17.tar.xz
anaconda-7a18b36030c65279e59ba529aef3a1847a61ff17.zip
tried adding deviceprobe command
Diffstat (limited to 'loader')
-rw-r--r--loader/kickstart.c1
-rw-r--r--loader/kickstart.h1
-rw-r--r--loader/loader.c13
3 files changed, 12 insertions, 3 deletions
diff --git a/loader/kickstart.c b/loader/kickstart.c
index 84d3e0c10..919066588 100644
--- a/loader/kickstart.c
+++ b/loader/kickstart.c
@@ -34,6 +34,7 @@ struct ksCommandNames ksTable[] = {
{ KS_CMD_DEVICE, "device" },
{ KS_CMD_XDISPLAY, "xdisplay" },
{ KS_CMD_DRIVERDISK, "driverdisk" },
+ { KS_CMD_DEVICEPROBE, "deviceprobe" },
{ KS_CMD_NONE, NULL }
};
diff --git a/loader/kickstart.h b/loader/kickstart.h
index a3e724338..ca85e3479 100644
--- a/loader/kickstart.h
+++ b/loader/kickstart.h
@@ -10,6 +10,7 @@
#define KS_CMD_XDISPLAY 7
#define KS_CMD_TEXT 8
#define KS_CMD_DRIVERDISK 9
+#define KS_CMD_DEVICEPROBE 10
int ksReadCommands(char * cmdFile);
int ksGetCommand(int cmd, char ** last, int * argc, char *** argv);
diff --git a/loader/loader.c b/loader/loader.c
index d246c603f..8d23dd766 100644
--- a/loader/loader.c
+++ b/loader/loader.c
@@ -1477,6 +1477,16 @@ static int kickstartDevices(struct knownDevices * kd, moduleInfoSet modInfo,
logMessage("module %s inserted successfully", device);
}
+ if (ksGetCommand(KS_CMD_DEVICEPROBE, ksArgv, &ksArgc, &ksArgv)) {
+ if (ksArgc != 1) {
+ logMessage("unexpected arguments to deviceprobe command");
+ }
+
+ logMessage("forcing device probe");
+
+ busProbe(modInfo, modLoaded, *modDepsPtr, 0, kd, flags);
+ }
+
kdFindScsiList(kd, 0);
kdFindNetList(kd, 0);
@@ -2183,9 +2193,6 @@ int main(int argc, char ** argv) {
{ "test", '\0', POPT_ARG_NONE, &testing, 0 },
{ 0, 0, 0, 0, 0 }
};
- struct device ** devices;
-
- devices = probeDevices(CLASS_FLOPPY, BUS_IDE, PROBE_ALL);
if (!strcmp(argv[0] + strlen(argv[0]) - 6, "insmod"))
return ourInsmodCommand(argc, argv);