Rel 10; cbc in pld 5.13 kernel is built-in, so handle that (fixes case when rootfs...

diff --git a/geninitrd-git.patch b/geninitrd-git.patch
index 1eccf06b3a552a5dc7153b163236a3d7a16e4d68..beb890658f634ee8127c6843fc2c920a09cdac71 100644 (file)
--- a/geninitrd-git.patch
+++ b/geninitrd-git.patch
@@ -588,3 +588,24 @@ index d6ade58..9224536 100644
        else
            verbose "swsusp: will try to resume from swap device $swap_dev"
        fi
+commit 640d6c7b308f0c0535ab0da05797847b2fcbfe69
+Author: Arkadiusz Miśkiewicz <arekm@maven.pl>
+Date:   Sun Aug 22 19:13:09 2021 +0200
+
+    AES/CBC can be built-in (and in PLD 5.13 kernel CBC is built-in).
+
+diff --git a/mod-luks.sh b/mod-luks.sh
+index ffe87cb..25dea8c 100644
+--- a/mod-luks.sh
++++ b/mod-luks.sh
+@@ -65,8 +65,8 @@ find_modules_luks() {
+       find_module "dm-crypt"
+ 
+       # TODO: autodetect
+-      find_module "aes"
+-      find_module "cbc"
++      find_module "-aes"
++      find_module "-cbc"
+       find_module "-af-alg"
+       find_module "-algif_hash"
+       find_module "-algif_skcipher"

diff --git a/geninitrd.spec b/geninitrd.spec
index 66a0335e1a3173e8b1833579292d6efc69eb2f28..8900321477943127fd2a9f01b121ac45eb2780d7 100644 (file)
--- a/geninitrd.spec
+++ b/geninitrd.spec
@@ -2,7 +2,7 @@ Summary:        Creates an initial ramdisk image for preloading modules
 Summary(pl.UTF-8):     Narzędzie do tworzenia inicjalnego ramdysku używanego przy starcie systemu
 Name:          geninitrd
 Version:       12787
-Release:       9
+Release:       10
 License:       GPL
 Group:         Applications/System
 Source0:       %{name}-%{version}.tar.gz