[arch-commits] Commit in cryptsetup/trunk (PKGBUILD hooks-encrypt)

[Christian Hesse]

    Date: Sunday, January 10, 2021 @ 20:18:36
  Author: eworm
Revision: 406063

ban bashism from encrypt hook

Thanks, Eli!

Modified:
  cryptsetup/trunk/PKGBUILD
  cryptsetup/trunk/hooks-encrypt

---------------+
 PKGBUILD      |    2 +-
 hooks-encrypt |    7 ++++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-01-10 20:13:55 UTC (rev 406062)
+++ PKGBUILD	2021-01-10 20:18:36 UTC (rev 406063)
@@ -20,7 +20,7 @@
         'install-sd-encrypt')
 sha256sums=('9d16eebb96b53b514778e813019b8dd15fea9fec5aafde9fae5febf59df83773'
             'SKIP'
-            '416aa179ce3c6a7a5eee0861f1f0a4fafac91b69e84a2aae82b6e5a6140e31e2'
+            'c17e7e0a3dc9567dc6492e6520abac8b04b570e6318bc6ac8965a1839984b0c2'
             'd325dc239ecc9a5324407b0782da6df2573e8491251836d6c4e65fa61339ce57'
             '31d816b3650a57512a5f9b52c1995fa65a161faa8b37975d07c9a1b8e1a119db')
 

Modified: hooks-encrypt
===================================================================
--- hooks-encrypt	2021-01-10 20:13:55 UTC (rev 406062)
+++ hooks-encrypt	2021-01-10 20:18:36 UTC (rev 406063)
@@ -55,7 +55,9 @@
         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)
                 cryptargs="${cryptargs} --allow-discards"
@@ -65,6 +67,9 @@
                 ;;
         esac
     done
+    set +f
+    IFS="$OLDIFS"
+    unset OLDIFS
 
     if resolved=$(resolve_device "${cryptdev}" ${rootdelay}); then
         if cryptsetup isLuks ${resolved} >/dev/null 2>&1; then