Merge pull request #872 from ancorgs/luks_advanced_sp6

New LUKS-related elements in the schema of the <partition> section
yast · Sep 22, 2023 · 1edbaf5 · 1edbaf5
2 parents 9d36e37 + bf4c58e
commit 1edbaf5
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 1 deletion.
diff --git a/package/autoyast2.changes b/package/autoyast2.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Fri Sep 22 10:25:35 UTC 2023 - Ancor Gonzalez Sosa <[email protected]>
+
+- Added several LUKS-related elements to the partitioning schema
+  (jsc#PED-3878, jsc#PED-5518).
+- 4.6.4
+
 -------------------------------------------------------------------
 Fri Sep 01 19:57:03 UTC 2023 - Josef Reidinger <[email protected]>
 

diff --git a/package/autoyast2.spec b/package/autoyast2.spec
@@ -22,7 +22,7 @@
 %endif
 
 Name:           autoyast2
-Version:        4.6.3
+Version:        4.6.4
 Release:        0
 Summary:        YaST2 - Automated Installation
 License:        GPL-2.0-only

diff --git a/src/autoyast-rnc/partitioning.rnc b/src/autoyast-rnc/partitioning.rnc
@@ -62,6 +62,10 @@ y2_partition =
   | part_crypt_fs
   | part_crypt_method
   | part_crypt_key
+  | part_crypt_pbkdf
+  | part_crypt_label
+  | part_crypt_cipher
+  | part_crypt_key_size
   | part_filesystem
   | part_format
   | part_fs_options
@@ -109,6 +113,10 @@ part_crypt_fs =
 part_crypt_method =
   element crypt_method { SYMBOL }
 part_crypt_key = element crypt_key { STRING }
+part_crypt_pbkdf = element crypt_pbkdf { SYMBOL }
+part_crypt_label = element crypt_label { STRING }
+part_crypt_cipher = element crypt_cipher { STRING }
+part_crypt_key_size = element crypt_key_size { INTEGER }
 part_filesystem =
   element filesystem { SYMBOL }
 part_format =