summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Cantrell <dcantrell@redhat.com>2007-04-03 19:35:49 +0000
committerDavid Cantrell <dcantrell@redhat.com>2007-04-03 19:35:49 +0000
commit148f0891383e8b5f2d409043c15a4045bce3d8c2 (patch)
tree920559b0442de919d46e1ad166c74faa0497b6d6
parentc8f843a8ff9c2847eac6889586b00acdbb6f8e75 (diff)
downloadanaconda-148f0891383e8b5f2d409043c15a4045bce3d8c2.tar.gz
anaconda-148f0891383e8b5f2d409043c15a4045bce3d8c2.tar.xz
anaconda-148f0891383e8b5f2d409043c15a4045bce3d8c2.zip
* loader2/net.c (chooseNetworkInterface): Honor nicdelay= when
ksdevice=link is used (#207546)
-rw-r--r--ChangeLog3
-rw-r--r--loader2/net.c2
2 files changed, 4 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index c4123a4b1..828fc6190 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,6 +6,9 @@
* text/partition_text.py (AutoPartitionWindow): Modify device list
to provide size and model information like we do in iw mode (#233606)
+ * loader2/net.c (chooseNetworkInterface): Honor nicdelay= when
+ ksdevice=link is used (#207546)
+
2007-03-27 Dave Lehman <dlehman@redhat.com>
* rescue.py (runRescue): fix selinux mount in rescue mode (#234137)
diff --git a/loader2/net.c b/loader2/net.c
index 9b46531e0..f48ddce6a 100644
--- a/loader2/net.c
+++ b/loader2/net.c
@@ -1061,7 +1061,7 @@ int chooseNetworkInterface(struct loaderData_s * loaderData,
logMessage("looking for first netDev with link");
for (rc = 0; rc < 5; rc++) {
for (i = 0; i < deviceNums; i++) {
- if (get_link_status(devices[i]) == 1) {
+ if (waitForLink(devices[i]) == 1) {
loaderData->netDev = devices[i];
logMessage("%s has link, using it", devices[i]);
return LOADER_NOOP;