Merge cf6ff08 into 32217e5

yast · Jul 22, 2022 · 49f508e · 49f508e
2 parents 32217e5 + cf6ff08
commit 49f508e
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 1 deletion.
diff --git a/library/desktop/src/clients/menu.rb b/library/desktop/src/clients/menu.rb
@@ -66,6 +66,13 @@ def main
         "Hidden"
       ]
 
+      # always load the desktop files from the system root
+      if WFM.scr_chrooted?
+        # revert back the chrooting
+        handle = Yast::WFM.SCROpen("chroot=/:scr", false)
+        Yast::WFM.SCRSetDefault(handle)
+      end
+
       Desktop.Read(@Values)
       @Groups = deep_copy(Desktop.Groups)
       @Modules = deep_copy(Desktop.Modules)

diff --git a/package/yast2.changes b/package/yast2.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Fri Jul 22 12:13:13 UTC 2022 - Ladislav Slezák <lslezak@suse.cz>
+
+- Text mode control center: always display the YaST modules
+  installed in the system root (when running in a container
+  display the modules installed in the container) (bsc#1199840)
+- 4.5.7
+
 -------------------------------------------------------------------
 Fri Jun 24 12:08:30 UTC 2022 - Ladislav Slezák <lslezak@suse.cz>
 

diff --git a/package/yast2.spec b/package/yast2.spec
@@ -17,7 +17,7 @@
 
 
 Name:           yast2
-Version:        4.5.6
+Version:        4.5.7
 
 Release:        0
 Summary:        YaST2 Main Package