summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDave Reisner <dreisner@archlinux.org>2016-11-28 23:47:14 +0100
committerDave Reisner <dreisner@archlinux.org>2017-03-10 13:19:21 +0100
commit5249350c80a6158ebcf278e780f42c6abc3643f1 (patch)
tree2af14a0d4f6949f9d6a59e9e1309a1d6dbed1559
parent30888208bf7b1b2bce3f0b132393b6a3bb303657 (diff)
downloadmkinitcpio-5249350c80a6158ebcf278e780f42c6abc3643f1.tar.gz
mkinitcpio-5249350c80a6158ebcf278e780f42c6abc3643f1.tar.xz
functions: attempt to (re)add builtin modules
crc32 is a builtin module in the Arch kernel but also a crypto module. Resolve by this only noting that a module is added if the value in the has is 1, and not 2 (indicating a builtin). While we're here, change the f2fs softdep of crc32 to crypto-crc32. ref: https://bugs.archlinux.org/task/49380
-rw-r--r--functions4
1 files changed, 2 insertions, 2 deletions
diff --git a/functions b/functions
index 756b968..4afc902 100644
--- a/functions
+++ b/functions
@@ -361,7 +361,7 @@ add_module() {
target=${1%.ko*} target=${target//-/_}
# skip expensive stuff if this module has already been added
- (( _addedmodules["$target"] )) && return
+ (( _addedmodules["$target"] == 1 )) && return
while IFS=':= ' read -r -d '' field value; do
case "$field" in
@@ -413,7 +413,7 @@ add_module() {
add_module "libcrc32c?"
;;
f2fs)
- add_module "crc32?"
+ add_module "crypto-crc32?"
;;
esac
}