summarylogtreecommitdiffstats
path: root/sd-encrypt
diff options
context:
space:
mode:
authorArvedui2020-08-22 15:12:41 +0200
committerArvedui2020-08-22 15:12:41 +0200
commitc3fe62282b6020310c0b74dee59afce08547cee6 (patch)
tree5ed5480d3ab53da267dd3363eb75aa697c1c5697 /sd-encrypt
parent0828b26d985e215807f839873b126fcc4e5e7c04 (diff)
downloadaur-cryptsetup-git.tar.gz
upgpkg: cryptsetup-git v2.3.3.r81.gf3ec1e22-1
sync mkinitcpio hooks with stable package and update packaging
Diffstat (limited to 'sd-encrypt')
-rw-r--r--sd-encrypt23
1 files changed, 15 insertions, 8 deletions
diff --git a/sd-encrypt b/sd-encrypt
index c18fd2f2422..1cc16cff9c2 100644
--- a/sd-encrypt
+++ b/sd-encrypt
@@ -3,13 +3,14 @@
build() {
local mod
- add_module dm-crypt
+ 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/'
+ add_all_modules "/crypto/"
fi
add_binary "dmsetup"
@@ -18,14 +19,20 @@ build() {
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"
- add_systemd_unit cryptsetup.target
- add_binary /usr/lib/systemd/system-generators/systemd-cryptsetup-generator
- add_binary /usr/lib/systemd/systemd-cryptsetup
+ add_systemd_unit "cryptsetup.target"
+ add_binary "/usr/lib/systemd/system-generators/systemd-cryptsetup-generator"
+ add_binary "/usr/lib/systemd/systemd-cryptsetup"
- add_systemd_unit systemd-ask-password-console.path
- add_systemd_unit systemd-ask-password-console.service
+ add_systemd_unit "systemd-ask-password-console.path"
+ add_systemd_unit "systemd-ask-password-console.service"
- [[ -f /etc/crypttab.initramfs ]] && add_file /etc/crypttab.initramfs /etc/crypttab
+ # cryptsetup calls pthread_create(), which dlopen()s libgcc_s.so.1
+ add_binary "/usr/lib/libgcc_s.so.1"
+
+ # add mkswap for creating swap space on the fly (see 'swap' in crypttab(5))
+ add_binary "mkswap"
+
+ [[ -f /etc/crypttab.initramfs ]] && add_file "/etc/crypttab.initramfs" "/etc/crypttab"
}
help() {