do not export subvolumes_prefix

yast · Nov 30, 2017 · 9c60bc0 · 9c60bc0
1 parent 19b0f7e
commit 9c60bc0
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 0 deletions.
diff --git a/src/modules/AutoinstPartPlan.rb b/src/modules/AutoinstPartPlan.rb
@@ -420,6 +420,14 @@ def Export
         drives << skip_device
       end
 
+      # Remove all subvolumes_prefix entries because they are defined
+      # in the product description files.
+      drives.each do |drive|
+        drive["partitions"].each do |partition|
+          partition.delete("subvolumes_prefix") if partition.has_key?("subvolumes_prefix")
+        end
+      end
+
       drives
     end
 

diff --git a/test/AutoinstPartPlan_test.rb b/test/AutoinstPartPlan_test.rb
@@ -92,5 +92,15 @@ def devicegraph_from(file_name)
       snapshots = subvolumes.select { |s| s.include?("snapshot") }
       expect(snapshots).to be_empty
     end
+
+    it "does not include subvolumes_prefix tag" do
+      subvolumes_prefix = exported.select do |drive|
+        partitions = drive["partitions"].select do |partition|
+          partition.has_key?("subvolumes_prefix")
+        end
+        !partitions.empty?
+      end
+      expect(subvolumes_prefix).to be_empty
+    end
   end
 end