[PATCH rhel6-branch] Don't limit linksleep option to ksdevice="link" ifaces (#784001)
Radek Vykydal
rvykydal at redhat.com
Tue Sep 18 11:47:04 UTC 2012
From: Dusty Mabe <dustymabe at gmail.com>
Resolves: rhbz#784001
---
loader/net.c | 18 +++++++++++++++++-
1 files changed, 17 insertions(+), 1 deletions(-)
diff --git a/loader/net.c b/loader/net.c
index f88f101..e8c4b43 100644
--- a/loader/net.c
+++ b/loader/net.c
@@ -2050,8 +2050,24 @@ int chooseNetworkInterface(struct loaderData_s * loaderData) {
if (ksMacAddr)
free(ksMacAddr);
- if (foundDev == 1)
+
+ /* If we know what device to use then we can return early */
+ if (foundDev == 1) {
+
+ /* BZ 784001: Need to wait for link so that later network
+ * requests won't attempt to use the device before
+ * it is ready. */
+ for (rc = 0; rc < num_link_checks; rc++) {
+ if (get_link_status(loaderData->netDev) == 0) {
+ logMessage(INFO, "%s still has no link, waiting", loaderData->netDev);
+ sleep(1);
+ } else {
+ logMessage(INFO, "%s has link, using it", loaderData->netDev);
+ break;
+ }
+ }
return LOADER_NOOP;
+ }
devices[deviceNums] = NULL;
deviceNames[deviceNums] = NULL;
--
1.7.4
More information about the anaconda-patches
mailing list