Merge 04179f7 into ac62e28

yast · Jun 17, 2019 · 76800e9 · 76800e9
2 parents ac62e28 + 04179f7
commit 76800e9
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 2 deletions.
diff --git a/package/yast2-network.changes b/package/yast2-network.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Mon Jun 17 15:47:45 UTC 2019 - Knut Anderssen <kanderssen@suse.com>
+
+- bsc#1133442
+  - Increased the DHCP timeout when NetworkManager is in use to
+    its default (45 seconds).
+- 3.4.9
+
 -------------------------------------------------------------------
 Mon Jun 10 11:55:48 UTC 2019 - Knut Anderssen <kanderssen@suse.com>
 

diff --git a/package/yast2-network.spec b/package/yast2-network.spec
@@ -17,7 +17,7 @@
 
 
 Name:           yast2-network
-Version:        3.4.8
+Version:        3.4.9
 Release:        0
 BuildArch:      noarch
 

diff --git a/src/modules/Lan.rb b/src/modules/Lan.rb
@@ -478,6 +478,8 @@ def writeIPv6
       nil
     end
 
+    NM_DHCP_TIMEOUT = 45
+
     # Update the SCR according to network settings
     # @return true on success
     def Write
@@ -616,7 +618,7 @@ def Write
 
       if NetworkService.is_network_manager
         network = false
-        timeout = 15
+        timeout = NM_DHCP_TIMEOUT
         while Ops.greater_than(timeout, 0)
           if NetworkService.isNetworkRunning
             network = true