Merge pull request #268 from yast/create-default-subvolumes

Create default subvolumes

package/autoyast2.changes

@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Wed Nov 30 09:30:26 UTC 2016 - igonzalezsosa@suse.com
+
+- If Btrfs subvolumes are not specified, the default set
+  is created (bsc#1012328)
+- 3.1.156
+
 -------------------------------------------------------------------
 Tue Nov 22 15:23:44 UTC 2016 - igonzalezsosa@suse.com
 

package/autoyast2.spec

@@ -17,7 +17,7 @@
 
 
 Name:           autoyast2
-Version:        3.1.155
+Version:        3.1.156
 Release:        0
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build

src/modules/AutoinstStorage.rb

@@ -1137,12 +1137,18 @@ def Write
           Builtins.y2milestone("disk: %1", tm[device])
 	  tm[device] = process_partition_data(device, sol)
 
-          if data["enable_snapshots"] && tm[device].has_key?("partitions")
-            root_partition = tm[device]["partitions"].find{|p| p["mount"] == "/" && p["used_fs"] == :btrfs}
-            if root_partition
+          root_partition = tm[device]["partitions"].find{|p| p["mount"] == "/" && p["used_fs"] == :btrfs}
+          if root_partition
+            if data["enable_snapshots"] && tm[device].has_key?("partitions")
               log.debug("Enabling snapshots for \"/\"; device #{data['device']}")
               root_partition["userdata"] = { "/" => "snapshots" }
             end
+            if root_partition["subvol"].nil?
+              # Add default subvolumes if none is defined (bsc#1012328)
+              log.info "Adding default subvolumes to #{root_partition["device"]}"
+              root_index = tm[device]["partitions"].index(root_partition)
+              tm[device]["partitions"][root_index] = Storage.AddSubvolRoot(root_partition)
+            end
           end
 
 	  changed = true