Attachment 2269 Details for Bug 5830 – Revised patch for netconnect.pm

[patch] Revised patch for netconnect.pm

patch-netconnect.diff (text/plain), 1.29 KB, created by Derek Jennings on 2012-05-11 14:24:39 CEST

(hide)

Description:

Filename:

MIME Type:

Creator: Derek Jennings

Created: 2012-05-11 14:24:39 CEST

Size: 1.29 KB

patch

obsolete

>--- /usr/lib/libDrakX/network/netconnect.pm	2011-12-05 11:06:32.000000000 +0000
>+++ netconnect.pm	2012-05-11 13:19:43.000000000 +0100
>@@ -314,14 +314,14 @@
>                                #- or start interface synchronously
>                                if (!$::isInstall) {
>                                    services::start('network-up');
>-                               } else {
>-                                   my $timeout = $connection->get_up_timeout;
>-                                   while ($timeout--) {
>-                                       my $status = $connection->get_status;
>-                                       last if $status;
>-                                       sleep 1;
>-                                   }
>+			       }
>+                               my $timeout = $connection->get_up_timeout;
>+                               while ($timeout--) {
>+                                   my $status = $connection->get_status;
>+                                   last if $status;
>+                                   sleep 1;
>                                }
>+                               
>                                $success = $connection->get_status();
>                                # try to resolve the network address for some time
>                                my $timeout = 3;

--- /usr/lib/libDrakX/network/netconnect.pm	2011-12-05 11:06:32.000000000 +0000
+++ netconnect.pm	2012-05-11 13:19:43.000000000 +0100
@@ -314,14 +314,14 @@
                                #- or start interface synchronously
                                if (!$::isInstall) {
                                    services::start('network-up');
-                               } else {
-                                   my $timeout = $connection->get_up_timeout;
-                                   while ($timeout--) {
-                                       my $status = $connection->get_status;
-                                       last if $status;
-                                       sleep 1;
-                                   }
+			       }
+                               my $timeout = $connection->get_up_timeout;
+                               while ($timeout--) {
+                                   my $status = $connection->get_status;
+                                   last if $status;
+                                   sleep 1;
                                }
+                               
                                $success = $connection->get_status();
                                # try to resolve the network address for some time
                                my $timeout = 3;

Actions: View | Diff

Attachments on bug 5830: 2250 | 2268 | 2269