Merge f1f406e into 3d79c54

yast · Sep 2, 2020 · c9626c3 · c9626c3
2 parents 3d79c54 + f1f406e
commit c9626c3
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 2 deletions.
diff --git a/package/autoyast2.changes b/package/autoyast2.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Wed Sep  2 16:03:15 CEST 2020 - schubi@suse.de
+
+- Enable encryption for RAIDs (bsc#1175624).
+- 3.2.32.7
+
 -------------------------------------------------------------------
 Fri Apr  3 09:27:04 CEST 2020 - schubi@suse.de
 

diff --git a/package/autoyast2.spec b/package/autoyast2.spec
@@ -17,7 +17,7 @@
 
 
 Name:           autoyast2
-Version:        3.2.32.6
+Version:        3.2.32.7
 Release:        0
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build

diff --git a/src/modules/AutoinstRAID.rb b/src/modules/AutoinstRAID.rb
@@ -174,8 +174,9 @@ def Write
 	  dev = "/dev/md"+md.fetch("partition_nr", 0).to_s
 	end
         md["device"] = dev
-        if Ops.get_symbol(md, "enc_type", :none) != :none
+        if md["crypt_fs"]
           Storage.SetCryptPwd(dev, Ops.get_string(md, "crypt_key", ""))
+          md["enc_type"] = md["format"] ? :luks : :twofish
         end
         Builtins.y2milestone("Working on %1", md)
         chunk_size = 4