Merge pull request #261 from yast/review_150910_autoyast_init_libstorage

[Review] Request from 'schubi2' @ 'yast/yast-bootloader/review_150910_autoyast_init_libstorage'
yast · Sep 10, 2015 · 92eccf5 · 92eccf5
2 parents 7531db2 + fd3f60e
commit 92eccf5
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 1 deletion.
diff --git a/package/yast2-bootloader.changes b/package/yast2-bootloader.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Thu Sep 10 14:45:51 CEST 2015 - schubi@suse.de
+
+- AutoYaST configuration: Initialize libstorage and do not regard
+  the installed system.
+  (bnc#942360)
+- 3.1.147
+
 -------------------------------------------------------------------
 Fri Sep  4 15:17:27 CEST 2015 - snwint@suse.de
 

diff --git a/package/yast2-bootloader.spec b/package/yast2-bootloader.spec
@@ -17,7 +17,7 @@
 
 
 Name:           yast2-bootloader
-Version:        3.1.146
+Version:        3.1.147
 Release:        0
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build

diff --git a/src/modules/BootStorage.rb b/src/modules/BootStorage.rb
@@ -415,6 +415,10 @@ def real_disks_for_partition(partition)
     # Sets properly boot, root and mbr disk.
     # @return true if proposal need to be reconfigured
     def detect_disks
+      # The AutoYaST config mode does access to the system.
+      # bnc#942360
+      return if Mode.config
+
       mp = Storage.GetMountPoints
 
       mountdata_boot = mp["/boot"] || mp["/"]

diff --git a/src/modules/Bootloader.rb b/src/modules/Bootloader.rb
@@ -542,6 +542,8 @@ def ReadOrProposeIfNeeded
         log.info "Not reading settings in Mode::config ()"
         BootCommon.was_read = true
         BootCommon.was_proposed = true
+        log.info "But initialize libstorage in readonly mode" # bnc#942360
+        Storage.InitLibstorage(true)
       elsif Stage.initial && !Mode.update
         Propose()
       else