Merge branch 'SLE-12-SP2-CASP' into merge-sle-12-sp2-into-casp

* SLE-12-SP2-CASP: Fix libstorage initialization (bsc#1011541) (#251)
yast · Jan 12, 2017 · bcf5be3 · bcf5be3
2 parents 190ac05 + 96ad9d4
commit bcf5be3
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 4 deletions.
diff --git a/package/yast2-storage.changes b/package/yast2-storage.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Tue Jan 10 16:03:29 UTC 2017 - igonzalezsosa@suse.com
+
+- Fix initialization of partitioning/btrfs_default_subvolume
+  product feature (bsc#1011541)
+- 3.2.4
+
 -------------------------------------------------------------------
 Tue Jan 10 14:41:54 UTC 2017 - ancor@suse.com
 

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

diff --git a/src/modules/Storage.rb b/src/modules/Storage.rb
@@ -337,6 +337,8 @@ def InitLibstorage(readonly)
         return false
       end
 
+      FileSystems.InitSlib(@sint)
+      Partitions.InitSlib(@sint)
       StorageClients.InstallCallbacks(@sint)
 
       if Stage.initial
@@ -352,9 +354,6 @@ def InitLibstorage(readonly)
       @conts = getContainers
       log.info("InitLibstorage conts:#{@conts}")
 
-      FileSystems.InitSlib(@sint)
-      Partitions.InitSlib(@sint)
-
       true
     end