[arch-commits] Commit in cryptsetup/trunk (3 files)

[Christian Hesse]

    Date: Monday, February 5, 2018 @ 20:40:47
  Author: eworm
Revision: 315914

initcpio install: add quotes, add libgcc_s.so.1 with add_binary

Modified:
  cryptsetup/trunk/PKGBUILD
  cryptsetup/trunk/install-encrypt
  cryptsetup/trunk/install-sd-encrypt

--------------------+
 PKGBUILD           |    4 ++--
 install-encrypt    |    6 +++---
 install-sd-encrypt |   18 +++++++++---------
 3 files changed, 14 insertions(+), 14 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-02-05 20:03:21 UTC (rev 315913)
+++ PKGBUILD	2018-02-05 20:40:47 UTC (rev 315914)
@@ -21,8 +21,8 @@
 sha256sums=('41d188092c52e23d576af41cf0cfe0555d8f7efa21598d4c57c56ea1b6d9c975'
             'SKIP'
             '416aa179ce3c6a7a5eee0861f1f0a4fafac91b69e84a2aae82b6e5a6140e31e2'
-            '6a68c833ff0af50651e66471aa21de8219e3cf66b28f87227a9580c48b689115'
-            'dbcb94323f65eab2cdd7a241fe3eba7aa3b344c1bdaaaa10a7fd800f146e61e8')
+            '7b8c8a189f1b63cb4a0c0dd93d3452615bdc05f0e33570c78b338446a59ca750'
+            '7891087a588ede7a5b885c439217af325c994471e821fbfbf4f4ccce47679261')
 
 build() {
   cd "${srcdir}"/$pkgname-${pkgver}

Modified: install-encrypt
===================================================================
--- install-encrypt	2018-02-05 20:03:21 UTC (rev 315913)
+++ install-encrypt	2018-02-05 20:40:47 UTC (rev 315914)
@@ -3,13 +3,13 @@
 build() {
     local mod
 
-    add_module dm-crypt
+    add_module "dm-crypt"
     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 "cryptsetup"
@@ -20,7 +20,7 @@
     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_file "/usr/lib/libgcc_s.so.1"
+    add_binary "/usr/lib/libgcc_s.so.1"
 
     add_runscript
 }

Modified: install-sd-encrypt
===================================================================
--- install-sd-encrypt	2018-02-05 20:03:21 UTC (rev 315913)
+++ install-sd-encrypt	2018-02-05 20:40:47 UTC (rev 315914)
@@ -3,13 +3,13 @@
 build() {
     local mod
 
-    add_module dm-crypt
+    add_module "dm-crypt"
     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,17 +18,17 @@
     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"
 
     # cryptsetup calls pthread_create(), which dlopen()s libgcc_s.so.1
-    add_file "/usr/lib/libgcc_s.so.1"
+    add_binary "/usr/lib/libgcc_s.so.1"
 
-    [[ -f /etc/crypttab.initramfs ]] && add_file /etc/crypttab.initramfs /etc/crypttab
+    [[ -f /etc/crypttab.initramfs ]] && add_file "/etc/crypttab.initramfs" "/etc/crypttab"
 }
 
 help() {