diff options
| -rw-r--r-- | loader2/cdinstall.c | 4 | ||||
| -rw-r--r-- | loader2/driverdisk.c | 8 | ||||
| -rw-r--r-- | loader2/kickstart.c | 2 | ||||
| -rw-r--r-- | loader2/loader.c | 6 | ||||
| -rw-r--r-- | loader2/modules.c | 4 | ||||
| -rw-r--r-- | loader2/net.c | 4 | ||||
| -rw-r--r-- | loader2/pcmcia.c | 2 | ||||
| -rw-r--r-- | loader2/urlinstall.c | 2 |
8 files changed, 16 insertions, 16 deletions
diff --git a/loader2/cdinstall.c b/loader2/cdinstall.c index 65951ece7..edd5a2357 100644 --- a/loader2/cdinstall.c +++ b/loader2/cdinstall.c @@ -299,7 +299,7 @@ char * setupCdrom(char * location, char *stage2img; struct device ** devices = NULL; - devices = probeDevices(CLASS_CDROM, BUS_UNSPEC, 0); + devices = probeDevices(CLASS_CDROM, BUS_UNSPEC, PROBE_LOADED); if (!devices) { logMessage("got to setupCdrom without a CD device"); return NULL; @@ -425,7 +425,7 @@ int kickstartFromCD(char *kssrc, int flags) { logMessage("getting kickstart file from first CDROM"); - devices = probeDevices(CLASS_CDROM, BUS_UNSPEC, 0); + devices = probeDevices(CLASS_CDROM, BUS_UNSPEC, PROBE_LOADED); if (!devices) { logMessage("No CDROM devices found!"); return 1; diff --git a/loader2/driverdisk.c b/loader2/driverdisk.c index 46985ffba..0eb60be0f 100644 --- a/loader2/driverdisk.c +++ b/loader2/driverdisk.c @@ -157,9 +157,9 @@ int getRemovableDevices(char *** devNames) { int i = 0, j = 0; floppies = probeDevices(CLASS_FLOPPY, - BUS_IDE | BUS_SCSI | BUS_MISC, 0); + BUS_IDE | BUS_SCSI | BUS_MISC, PROBE_LOADED); cdroms = probeDevices(CLASS_CDROM, - BUS_IDE | BUS_SCSI | BUS_MISC, 0); + BUS_IDE | BUS_SCSI | BUS_MISC, PROBE_LOADED); /* we should probably take detached into account here, but it just * means we use a little bit more memory than we really need to */ @@ -298,7 +298,7 @@ int loadDriverFromMedia(int class, moduleList modLoaded, int found = 0, before = 0; struct device ** devices; - devices = probeDevices(class, BUS_UNSPEC, 0); + devices = probeDevices(class, BUS_UNSPEC, PROBE_LOADED); if (devices) for(; devices[before]; before++); @@ -322,7 +322,7 @@ int loadDriverFromMedia(int class, moduleList modLoaded, busProbe(modInfo, modLoaded, *modDepsPtr, 0, flags); - devices = probeDevices(class, BUS_UNSPEC, 0); + devices = probeDevices(class, BUS_UNSPEC, PROBE_LOADED); if (devices) for(; devices[before]; found++); diff --git a/loader2/kickstart.c b/loader2/kickstart.c index 6bbd279fd..970c00ad7 100644 --- a/loader2/kickstart.c +++ b/loader2/kickstart.c @@ -225,7 +225,7 @@ int kickstartFromFloppy(char *kssrc, int flags) { int i, rc; logMessage("doing kickstart from floppy"); - devices = probeDevices(CLASS_FLOPPY, BUS_MISC | BUS_IDE | BUS_SCSI, 0); + devices = probeDevices(CLASS_FLOPPY, BUS_MISC | BUS_IDE | BUS_SCSI, PROBE_LOADED); if (!devices) { logMessage("no floppy devices"); return 1; diff --git a/loader2/loader.c b/loader2/loader.c index 1f5ee8abc..575175f8f 100644 --- a/loader2/loader.c +++ b/loader2/loader.c @@ -362,7 +362,7 @@ static void checkForHardDrives(int * flagsPtr) { int i; struct device ** devices; - devices = probeDevices(CLASS_HD, BUS_UNSPEC, 0); + devices = probeDevices(CLASS_HD, BUS_UNSPEC, PROBE_LOADED); if (devices) return; @@ -515,7 +515,7 @@ static int parseCmdLineFlags(int flags, struct loaderData_s * loaderData, else if (!strcasecmp(argv[i], "kssendmac")) flags |= LOADER_FLAGS_KICKSTART_SEND_MAC; else if (!strncasecmp(argv[i], "debug=", 6)) - setLogLevel(strtol(argv[i] + 6, (char **)NULL, 10)); + setLogLevel(strtol(argv[i] + 6, (char **)NULL, 10)); else if (!strncasecmp(argv[i], "ksdevice=", 9)) { loaderData->netDev = strdup(argv[i] + 9); loaderData->netDev_set = 1; @@ -633,7 +633,7 @@ static void checkForRam(int flags) { static int haveDeviceOfType(int type, moduleList modLoaded) { struct device ** devices; - devices = probeDevices(type, BUS_UNSPEC, 0); + devices = probeDevices(type, BUS_UNSPEC, PROBE_LOADED); if (devices) { int i; for (i = 0; devices[i]; i++) { diff --git a/loader2/modules.c b/loader2/modules.c index 158ee6a9a..1a69f3e2f 100644 --- a/loader2/modules.c +++ b/loader2/modules.c @@ -92,13 +92,13 @@ static int scsiDiskCount(void) { struct device ** devices; int i = 0; - devices = probeDevices(CLASS_HD, BUS_SCSI, 0); + devices = probeDevices(CLASS_HD, BUS_SCSI, PROBE_LOADED); if (devices) { for (; devices[i]; i++); free(devices); } /* have to probe for usb floppies too */ - devices = probeDevices(CLASS_FLOPPY, BUS_SCSI, 0); + devices = probeDevices(CLASS_FLOPPY, BUS_SCSI, PROBE_LOADED); if (devices) { for (; devices[i]; i++); free(devices); diff --git a/loader2/net.c b/loader2/net.c index 8a7dcc3b2..50aef6903 100644 --- a/loader2/net.c +++ b/loader2/net.c @@ -566,7 +566,7 @@ int writeNetInfo(const char * fn, struct networkDeviceConfig * dev) { int i; struct device ** devices; - devices = probeDevices(CLASS_NETWORK, BUS_UNSPEC, 0); + devices = probeDevices(CLASS_NETWORK, BUS_UNSPEC, PROBE_LOADED); if (!devices) return 0; @@ -788,7 +788,7 @@ int chooseNetworkInterface(struct loaderData_s * loaderData, int foundDev = 0; struct device ** devs; - devs = probeDevices(CLASS_NETWORK, BUS_UNSPEC, 0); + devs = probeDevices(CLASS_NETWORK, BUS_UNSPEC, PROBE_LOADED); if (!devs) { logMessage("no network devices in choose network device!"); return LOADER_ERROR; diff --git a/loader2/pcmcia.c b/loader2/pcmcia.c index bda60c2d8..ad8445399 100644 --- a/loader2/pcmcia.c +++ b/loader2/pcmcia.c @@ -190,7 +190,7 @@ void startPcmciaDevices(moduleList modLoaded, int flags) { if (has_pcmcia() <= 0) return; - devices = probeDevices(CLASS_UNSPEC, BUS_PCMCIA, 0); + devices = probeDevices(CLASS_UNSPEC, BUS_PCMCIA, PROBE_LOADED); if (!devices) { logMessage("no devices to activate"); return; diff --git a/loader2/urlinstall.c b/loader2/urlinstall.c index db2e23dee..52894af0f 100644 --- a/loader2/urlinstall.c +++ b/loader2/urlinstall.c @@ -366,7 +366,7 @@ int getFileFromUrl(char * url, char * dest, struct device ** devices; hdrlen = 0; - devices = probeDevices(CLASS_NETWORK, BUS_UNSPEC, 0); + devices = probeDevices(CLASS_NETWORK, BUS_UNSPEC, PROBE_LOADED); for (i = 0; devices && devices[i]; i++) { dev = devices[i]->device; mac = getMacAddr(dev); |