Merge pull request #1324 from yast/fix_closing_scr

Fix restoring SCR root (bsc#1207968)
yast · Feb 10, 2023 · e707387 · e707387
2 parents 6c667c3 + b2d8292
commit e707387
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 2 deletions.
diff --git a/package/yast2-network.changes b/package/yast2-network.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Thu Feb  9 21:19:33 UTC 2023 - Josef Reidinger <jreidinger@suse.com>
+
+- Fix calling method read on nil crash in bootloader caused by
+  not restoring SCR chroot in save_network client when running
+  in autoyast (bsc#1207968)
+- 4.5.16
+
 -------------------------------------------------------------------
 Wed Jan 25 13:52:26 UTC 2023 - Knut Alejandro Anderssen González <kanderssen@suse.com>
 

diff --git a/package/yast2-network.spec b/package/yast2-network.spec
@@ -17,7 +17,7 @@
 
 
 Name:           yast2-network
-Version:        4.5.15
+Version:        4.5.16
 Release:        0
 Summary:        YaST2 - Network Configuration
 License:        GPL-2.0-only

diff --git a/src/lib/network/clients/save_network.rb b/src/lib/network/clients/save_network.rb
@@ -72,7 +72,7 @@ def on_local(&block)
       WFM.SCRSetDefault(new_SCR)
 
       block.call
-
+    ensure
       # close and chroot back
       WFM.SCRSetDefault(old_SCR)
       WFM.SCRClose(new_SCR)