Allow <raid_options> to appear under <drive> section

yast · Oct 22, 2018 · d6973e5 · d6973e5
1 parent a9e0f4f
commit d6973e5
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 6 deletions.
diff --git a/package/autoyast2.changes b/package/autoyast2.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Mon Oct 22 08:25:08 WEST 2018 - igonzalezsosa@suse.com
+
+- Adapt schema to support the new way of defining a software
+  RAID (fate#326573).
+- 4.0.64
+
 -------------------------------------------------------------------
 Thu Oct 11 18:08:56 UTC 2018 - knut.anderssen@suse.com
 

diff --git a/package/autoyast2.spec b/package/autoyast2.spec
@@ -22,7 +22,7 @@
 %endif
 
 Name:           autoyast2
-Version:        4.0.63
+Version:        4.0.64
 Release:        0
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build

diff --git a/src/autoyast-rnc/partitioning.rnc b/src/autoyast-rnc/partitioning.rnc
@@ -20,7 +20,8 @@ drive =
     element disklabel  { text }? &
     element enable_snapshots { BOOLEAN }? &
     skip_list? &
-    partitions?
+    partitions? &
+    raid_options?
   }
 
 skip_list =
@@ -63,9 +64,7 @@ y2_partition =
   | part_partition_id
   | part_partition_nr
   | part_partition_type
-  | part_raid_name
   | part_resize
-  | part_raid_options
   | part_raid_type
   | part_region
   | part_size
@@ -75,6 +74,8 @@ y2_partition =
   | part_used_pool
   | part_subvolumes_prefix
   | device_order
+  | raid_name
+  | raid_options
   | subvolumes
   | create_subvolumes
 
@@ -116,9 +117,9 @@ opt_max_inode_space =
 opt_raid = element opt_raid { option_str, option_value }
 opt_reserved_blocks =
   element opt_reserved_blocks { option_str, option_value }
-part_raid_name = element raid_name { text }
+raid_name = element raid_name { text }
 
-part_raid_options = element raid_options { persistent_superblock? & chunk_size? & parity_algorithm? & raid_type? & device_order? & part_raid_name? }
+raid_options = element raid_options { persistent_superblock? & chunk_size? & parity_algorithm? & raid_type? & device_order? & raid_name? }
 persistent_superblock = element persistent_superblock { BOOLEAN }
 raid_type = element raid_type { text }
 chunk_size = element chunk_size { text }