[PATCH rhel6-branch] Honor linksleep boot option (#713991)

[Radek Vykydal <rvykydal@xxxxxxxxxx>]

As in rhel 5.

Resolves: rhbz#713991
---
 loader/net.c |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/loader/net.c b/loader/net.c
index c303fbe..155fae6 100644
--- a/loader/net.c
+++ b/loader/net.c
@@ -1772,6 +1772,7 @@ int chooseNetworkInterface(struct loaderData_s * loaderData) {
     int lookForLink = 0;
     struct newtWinEntry entry[] = {{N_("Seconds:"), (char **) &seconds, 0},
                                    {NULL, NULL, 0 }};
+    extern int num_link_checks;
 
     devs = getDevices(DEVICE_NETWORK);
     if (!devs) {
@@ -1881,8 +1882,8 @@ int chooseNetworkInterface(struct loaderData_s * loaderData) {
                            devs[i]->device, devmacaddr);
                 free(devmacaddr);
 
-                /* wait for the link (max 5s) */
-                for (rc = 0; rc < 5; rc++) {
+                /* wait for the link */
+                for (rc = 0; rc < num_link_checks; rc++) {
                     if (get_link_status(devs[i]->device) == 0) {
                         logMessage(INFO, "%s still has no link, waiting", devs[i]->device);
                         sleep(1);                 
@@ -1924,7 +1925,7 @@ int chooseNetworkInterface(struct loaderData_s * loaderData) {
     if (lookForLink) {
         logMessage(INFO, "looking for first netDev with link");
 
-        for (rc = 0; rc < 5; rc++) {
+        for (rc = 0; rc < num_link_checks; rc++) {
             for (i = 0; i < deviceNums; i++) {
                 if (get_link_status(devices[i]) == 1) {
                     loaderData->netDev = devices[i];
-- 
1.7.4

_______________________________________________
Anaconda-devel-list mailing list
Anaconda-devel-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/anaconda-devel-list