Merge pull request #1051 from yast/refresh_system_config

Refresh system config after writing yast_config to the system (bsc#1162987)
yast · Mar 27, 2020 · 113ed20 · 113ed20
2 parents bbefa54 + 17fe3b2
commit 113ed20
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 1 deletion.
diff --git a/package/yast2-network.changes b/package/yast2-network.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Fri Mar 27 14:30:34 UTC 2020 - Knut Anderssen <kanderssen@suse.com>
+
+- Refresh the current system cached network configuration with the
+  one written avoiding inconsistencies during installation
+  (bsc#1162987)
+- 4.2.64
+
 -------------------------------------------------------------------
 Thu Mar 19 13:52:31 UTC 2020 - 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:        4.2.63
+Version:        4.2.64
 Release:        0
 Summary:        YaST2 - Network Configuration
 License:        GPL-2.0-only

diff --git a/src/modules/Lan.rb b/src/modules/Lan.rb
@@ -506,6 +506,8 @@ def Write(gui: true)
 
       target = :sysconfig if Mode.auto
       yast_config.write(original: system_config, target: target)
+      # Force a refresh of the system_config bsc#1162987
+      add_config(:system, yast_config.copy)
       Progress.set(orig)
       Builtins.sleep(sl)