From: Arkadiusz Miśkiewicz <arekm@maven.pl>
Date: Sun, 22 Aug 2021 17:14:59 +0000 (+0200)
Subject: Rel 10; cbc in pld 5.13 kernel is built-in, so handle that (fixes case when rootfs... 
X-Git-Tag: auto/th/geninitrd-12787-10
X-Git-Url: http://git.pld-linux.org/gitweb.cgi?a=commitdiff_plain;h=dbb71e1004fa507762bee7f3f76360fa286b4850;p=packages%2Fgeninitrd.git

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

diff --git a/geninitrd-git.patch b/geninitrd-git.patch
index 1eccf06..beb8906 100644
--- 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 66a0335..8900321 100644
--- 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