summary refs log tree commit diff
diff options
context:
space:
mode:
authorBrendan Tildesley <brendan.tildesley@openmailbox.org>2018-07-26 09:13:52 +1000
committerLeo Famulari <leo@famulari.name>2018-07-26 13:19:57 -0400
commite8ec2dda08d36f3a8d17f840980ea82585d1fc38 (patch)
tree59b42c1629cb7a3292f783e4bc591112e055f2eb
parent92526ade57e0bd23ab4025b8532511ef80df5fba (diff)
downloadguix-e8ec2dda08d36f3a8d17f840980ea82585d1fc38.tar.gz
gnu: ecryptfs-utils: Patch more hardcoded paths.
* gnu/packages/linux.scm (ecryptfs-utils): [arguments]: Add an additional file
to be patched that was missing in the last fix. Ecryptfs will now find the
umount binary path as well as mount and others. Re-sort the list of files to be
substituted.

Signed-off-by: Leo Famulari <leo@famulari.name>
-rw-r--r--gnu/packages/linux.scm4
1 files changed, 3 insertions, 1 deletions
diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index 7ecc795b1f..70615df93c 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -3714,10 +3714,12 @@ as used on certified hardware security devices.")
                (substitute* '("src/utils/ecryptfs-mount-private"
                               "src/utils/ecryptfs-umount-private"
                               "src/utils/ecryptfs-setup-private"
+                              "src/utils/ecryptfs-setup-swap"
                               "src/utils/mount.ecryptfs.c"
+                              "src/utils/umount.ecryptfs.c"
                               "src/pam_ecryptfs/pam_ecryptfs.c"
                               "src/desktop/ecryptfs-mount-private.desktop.in"
-                              "src/utils/ecryptfs-setup-swap")
+                              "src/desktop/ecryptfs-setup-private.desktop.in")
                  (("/bin/mount")
                   (string-append utils-linux "/bin/mount"))
                  (("/bin/umount")