diff options
| -rw-r--r-- | PKGBUILD | 10 | ||||
| -rw-r--r-- | encrypt.install | 40 | ||||
| -rw-r--r-- | encrypt2.hook | 15 | ||||
| -rw-r--r-- | encrypt3.hook | 15 | ||||
| -rw-r--r-- | encrypt4.hook | 15 |
5 files changed, 63 insertions, 32 deletions
@@ -4,7 +4,7 @@ # Artix lacks this init script entirely pkgname=cryptsetup-raid -pkgver=202008802 +pkgver=20210621 pkgrel=1 pkgdesc="Extra encrypt hooks for raids" arch=('any') @@ -17,10 +17,10 @@ source=( "encrypt4.hook" "encrypt.install" ) -b2sums=('e5a14b05aea56629c04cbe2795917f4d4e6fefb8bfec3076caff322f86e993fb286020d4b611960a1c0c1c3787f09942cd7127b1565c2a59b7923c6423d922a1' - 'b2bd6cd6f4514293fe35ec2142ebe3e705b3defd6955508d9526cabd515c0d3306ef33be0a389214398a9586f3c31786e46c1165675a9e4f483b4cfe5fd84a12' - 'd1f918fc7ca54afdd2306fc7f75b7affbb5396df621b72986f118902d90b05c61fd5b37393ab5a2abfc155ee937ffc37325827c29ba908b3c3490523e149e9a4' - '6b0a9368e491757ef6e4f67a44b518741253e702d16e3502f51634333069ff676032f4afc61151bdf29f3c2a8d4afd4f4c1b804ececb353bce8707bf8008519b') +b2sums=('cc3169ee8ba272f8f138a4cca1413cce8b5f160a55b4e224c30a796b5a04665a7c5eb134705cee3dbbb885263bb3f26856b25f4e9c818885031388743967d010' + 'a25888559a4e17aab7b278661dd0d04d39f855f4aacf672b6d0597b3b999943232a59d52beb0858da0cc97b99c81423bbd97d3088170826e48710e8ba1820d75' + 'c30dd238740d57e878dd8fe94ad3111c4dccd69c138348709b4ba095c0d0def4eaca551cb176a4ab3ab0a19840576625f723f9e126c56f7a3f2c422c80b1752b' + '4adc0359edd9011d0634b911e08b3df602c77325a2ae1dfa2fe8c3469aef6c8ac11ebac70434554f945c1383412763e4acb3ca3533536bcb05753614bed60488') package() { install -Dm644 ${srcdir}/encrypt2.hook ${pkgdir}/usr/lib/initcpio/hooks/encrypt2 diff --git a/encrypt.install b/encrypt.install index 4cffb4f..b95264c 100644 --- a/encrypt.install +++ b/encrypt.install @@ -1,27 +1,27 @@ #!/bin/bash build() { - local mod - - add_module "dm-crypt" - add_module "dm-integrity" - if [[ $CRYPTO_MODULES ]]; then - for mod in $CRYPTO_MODULES; do - add_module "$mod" - done - else - add_all_modules "/crypto/" - fi - - add_binary "cryptsetup" - add_binary "dmsetup" - add_file "/usr/lib/udev/rules.d/10-dm.rules" - add_file "/usr/lib/udev/rules.d/13-dm-disk.rules" - add_file "/usr/lib/udev/rules.d/95-dm-notify.rules" - add_file "/usr/lib/initcpio/udev/11-dm-initramfs.rules" "/usr/lib/udev/rules.d/11-dm-initramfs.rules" +# local mod + +# add_module "dm-crypt" +# add_module "dm-integrity" +# if [[ $CRYPTO_MODULES ]]; then +# for mod in $CRYPTO_MODULES; do +# add_module "$mod" +# done +# else +# add_all_modules "/crypto/" +# fi + +# add_binary "cryptsetup" +# add_binary "dmsetup" +# add_file "/usr/lib/udev/rules.d/10-dm.rules" +# add_file "/usr/lib/udev/rules.d/13-dm-disk.rules" +# add_file "/usr/lib/udev/rules.d/95-dm-notify.rules" +# add_file "/usr/lib/initcpio/udev/11-dm-initramfs.rules" "/usr/lib/udev/rules.d/11-dm-initramfs.rules"# # cryptsetup calls pthread_create(), which dlopen()s libgcc_s.so.1 - add_binary "/usr/lib/libgcc_s.so.1" +# add_binary "/usr/lib/libgcc_s.so.1" add_runscript } @@ -44,5 +44,3 @@ the keymap hook as well to ensure that the keyboard is using the layout you expect. HELPEOF } - -# vim: set ft=sh ts=4 sw=4 et: 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 diff --git a/encrypt3.hook b/encrypt3.hook index ba86efc..f48a1c1 100644 --- a/encrypt3.hook +++ b/encrypt3.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 diff --git a/encrypt4.hook b/encrypt4.hook index 2e241ef..818e100 100644 --- a/encrypt4.hook +++ b/encrypt4.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 |