Merged SLE-12-SP2-CASP branch to master

yast · Aug 23, 2017 · c7e8065 · c7e8065
2 parents 2cf31e1 + b39f158
commit c7e8065
Show file tree

Hide file tree

Showing 3 changed files with 44 additions and 2 deletions.
diff --git a/package/yast2-storage.changes b/package/yast2-storage.changes
@@ -1,3 +1,28 @@
+-------------------------------------------------------------------
+Wed Aug 23 14:13:02 CEST 2017 - shundhammer@suse.de
+
+- Merged SLE-12-SP2-CASP branch to master
+- 3.2.18
+
+-------------------------------------------------------------------
+Mon Aug 21 10:32:52 UTC 2017 - igonzalezsosa@suse.com
+
+- Fix Btrfs default subvolume name detection (bsc#1044434 and
+  bsc#1044250)
+- Read default subvolume name for Btrfs filesystems when using
+  the expert partitioner (bsc#1040154)
+
+-------------------------------------------------------------------
+Wed Aug 16 11:34:48 CEST 2017 - shundhammer@suse.de
+
+- Make filesystem type for home and root configurable in control.xml
+  (bsc#1051762)
+
+-------------------------------------------------------------------
+Thu Jul 20 10:45:18 CEST 2017 - aschnell@suse.com
+
+- fixed check whether snapshots are proposed (bsc#1049108)
+
 -------------------------------------------------------------------
 Mon Jun 26 11:13:00 CEST 2017 - shundhammer@suse.de
 

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

diff --git a/src/modules/StorageProposal.rb b/src/modules/StorageProposal.rb
@@ -356,6 +356,9 @@ def GetControlCfg
 
         SetProposalDefault(false)
         Builtins.y2milestone("GetControlCfg cfg_xml: %1", @cfg_xml)
+
+        @proposal_home_fs = get_fs_type_from_control_xml("home_fs", @proposal_home_fs)
+        @proposal_root_fs = get_fs_type_from_control_xml("root_fs", @proposal_root_fs)
       end
       ret = deep_copy(@cfg_xml)
       Builtins.y2milestone(
@@ -6601,7 +6604,7 @@ def CouldNotDoSnapshots(prop_target_map)
       ret = false
       if GetProposalSnapshots()
         prop_target_map.each do |device, container|
-          container["partitions"].each do |volume|
+          container.fetch("partitions", []).each do |volume|
             if !volume.fetch("delete", false)
               if volume.fetch("used_fs", :none) == :btrfs && volume.fetch("mount", "") == "/"
                 userdata = volume.fetch("userdata", {})
@@ -6683,6 +6686,20 @@ def strategy=(value)
       SetProposalEncrypt(value == :lvm_crypt)
     end
 
+    # Get a filesystem type from control.xml.
+    #
+    # @param [String] name  key below "partitioning" in control.xml
+    # @param [Symbol] fallback  fallback value if not present in control.xml
+    # @return [Symbol] filesystem type (:btrfs, :xfs, :ext4, ...)
+    #
+    def get_fs_type_from_control_xml(name, fallback)
+      fs = ProductFeatures.GetStringFeature("partitioning", name)
+      fs = fallback if fs.nil? || fs.empty?
+      fs = fs.downcase.to_sym unless fs.is_a?(Symbol)
+      log.info("#{name}: #{fs}") unless fs == fallback
+      fs
+    end
+
     publish :function => :SetCreateVg, :type => "void (boolean)"
     publish :function => :GetProposalHome, :type => "boolean ()"
     publish :function => :SetProposalHome, :type => "void (boolean)"