diff options
| author | David Cantrell <dcantrell@redhat.com> | 2007-08-30 17:11:34 +0000 |
|---|---|---|
| committer | David Cantrell <dcantrell@redhat.com> | 2007-08-30 17:11:34 +0000 |
| commit | a8bb810e9eeefca20473051fef8a759105ff6c4e (patch) | |
| tree | b8ad5c69c66dfe47d3115f1428ee0c1e157d446c /loader2 | |
| parent | 01a7ca6925a777d56b5501d100ed5488cdad3ae1 (diff) | |
* loader2/net.c (chooseNetworkInterface): Skip devices that do not
have firmware loaded (#251941).
* scripts/upd-instroot: Add *-firmware to PACKAGES for now. We'll
change this later once the kernel provides us with more
info (#177452).
* scripts/mk-images (makeinitrd): Remove arch test for copying over
firmware files. Just check the module list and copy firmware, also
add atmel and iwl4965 (#177452).
Diffstat (limited to 'loader2')
| -rw-r--r-- | loader2/net.c | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/loader2/net.c b/loader2/net.c index 227ed9b0d..720b54c8b 100644 --- a/loader2/net.c +++ b/loader2/net.c @@ -1727,6 +1727,13 @@ int chooseNetworkInterface(struct loaderData_s * loaderData) { for (i = 0; devs[i]; i++) { if (!devs[i]->device) continue; + + /* if kudzu hands us a device name of 'eth', we lack firmware */ + /* skip the device as an option for installation (#251941) */ + if ((strlen(devs[i]->device) == 3) && + (!strncmp(devs[i]->device, "eth", 3))) + continue; + if (devs[i]->desc) { deviceNames[deviceNums] = alloca(strlen(devs[i]->device) + strlen(devs[i]->desc) + 4); @@ -1734,12 +1741,14 @@ int chooseNetworkInterface(struct loaderData_s * loaderData) { devs[i]->device, devs[i]->desc); if (strlen(deviceNames[deviceNums]) > max) max = strlen(deviceNames[deviceNums]); - devices[deviceNums++] = devs[i]->device; + devices[deviceNums] = devs[i]->device; } else { devices[deviceNums] = devs[i]->device; - deviceNames[deviceNums++] = devs[i]->device; + deviceNames[deviceNums] = devs[i]->device; } + deviceNums++; + /* this device has been set and we don't really need to ask * about it again... */ if (loaderData->netDev && (loaderData->netDev_set == 1)) { |