From 504ba53f45ed3894c42830a48b39391190e25ea1 Mon Sep 17 00:00:00 2001
From: jc_gargma <jc_gargma@iserlohn-fortress.net>
Date: Mon, 21 Jun 2021 17:44:57 -0700
Subject: Update encrypt hooks for new initcpio releases

---
 encrypt2.hook | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

(limited to 'encrypt2.hook')

diff --git a/encrypt2.hook b/encrypt2.hook
index 22f7fef..c0ed836 100644
--- a/encrypt2.hook
+++ b/encrypt2.hook
@@ -54,16 +54,27 @@ EOF
         echo "Use 'cryptdevice=${root}:root root=/dev/mapper/root' instead."
     }
 
-    for cryptopt in ${cryptoptions//,/ }; do
+    set -f
+    OLDIFS="$IFS"; IFS=,
+    for cryptopt in ${cryptoptions}; do
         case ${cryptopt} in
-            allow-discards)
+            allow-discards|discard)
                 cryptargs="${cryptargs} --allow-discards"
                 ;;
+            no-read-workqueue|perf-no_read_workqueue)
+                cryptargs="${cryptargs} --perf-no_read_workqueue"
+                ;;
+            no-write-workqueue|perf-no_read_workqueue)
+                cryptargs="${cryptargs} --perf-no_write_workqueue"
+                ;;
             *)
                 echo "Encryption option '${cryptopt}' not known, ignoring." >&2
                 ;;
         esac
     done
+    set +f
+    IFS="$OLDIFS"
+    unset OLDIFS
 
     if resolved=$(resolve_device "${cryptdev}" ${rootdelay}); then
         if cryptsetup isLuks ${resolved} >/dev/null 2>&1; then
-- 
cgit v1.2.1