- fixed initialisation of btrfs subvolumes (bnc#872210)

yast · Jul 14, 2014 · ba1d185 · ba1d185
1 parent 4630930
commit ba1d185
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 1 deletion.
diff --git a/package/yast2-storage.changes b/package/yast2-storage.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon Jul 14 16:07:49 CEST 2014 - aschnell@suse.de
+
+- fixed initialisation of btrfs subvolumes (bnc#872210)
+- version 3.1.38
+
 -------------------------------------------------------------------
 Thu Jul 10 12:25:03 CEST 2014 - aschnell@suse.de
 

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

diff --git a/src/include/partitioning/custom_part_lib.rb b/src/include/partitioning/custom_part_lib.rb
@@ -694,6 +694,12 @@ def HandlePartWidgetChanges(init, ret, file_systems, old, new)
           UI.ChangeWidget(Id(:fstab_options), :Enabled, !Builtins.isempty(mp))
         end
       end
+
+      # set btrfs subvolumes (bnc#872210)
+      if init
+        new = HandleSubvol(new)
+      end
+
       if init && UI.WidgetExists(Id(:format)) || ret == :do_format ||
           ret == :do_not_format
         format = UI.QueryWidget(Id(:format), :Value) == :do_format

diff --git a/src/include/partitioning/ep-dialogs.rb b/src/include/partitioning/ep-dialogs.rb
@@ -249,6 +249,7 @@ def MiniWorkflowStepFormatMount(orig_data)
           data["fsid"] = Partitions.fsid_swap
           data["ori_fsid"] = Partitions.fsid_swap
           data["used_fs"] = used_fs
+          data["mount"] = mount_point_proposal
 
         when :raw
           mount_point_proposal = ""
@@ -274,6 +275,7 @@ def MiniWorkflowStepFormatMount(orig_data)
           data["fsid"] = Partitions.fsid_native
           data["ori_fsid"] = Partitions.fsid_native
           data["used_fs"] = used_fs
+          data["mount"] = mount_point_proposal
 
         end