1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
|
From: Alberto Garcia <berto@igalia.com>
Subject: Use /usr for all paths
Origin: https://github.com/bertogg/fido2luks/commit/492a2a93364a29c2ec6277f5a0dd7c1bddc465c3
Index: fido2luks/Makefile
===================================================================
--- fido2luks.orig/Makefile
+++ fido2luks/Makefile
@@ -5,5 +5,5 @@ clean:
@echo "Nothing to do"
install:
- install -D -m 0755 keyscript.sh $(DESTDIR)/lib/fido2luks/keyscript.sh
+ install -D -m 0755 keyscript.sh $(DESTDIR)/usr/lib/fido2luks/keyscript.sh
install -D -m 0755 initramfs-hook $(DESTDIR)/etc/initramfs-tools/hooks/fido2luks
Index: fido2luks/README.md
===================================================================
--- fido2luks.orig/README.md
+++ fido2luks/README.md
@@ -30,7 +30,7 @@ This has been successfully tested with D
You should be able to see the `systemd-fido2` token data if you run
`cryptsetup luksDump /dev/XXX`.
-- Edit `/etc/crypttab` and add `keyscript=/lib/fido2luks/keyscript.sh`
+- Edit `/etc/crypttab` and add `keyscript=/usr/lib/fido2luks/keyscript.sh`
to the options of the volume that you want to unlock.
- Generate a new initramfs with `update-initramfs -u`.
Index: fido2luks/examples/crypttab
===================================================================
--- fido2luks.orig/examples/crypttab
+++ fido2luks/examples/crypttab
@@ -1,4 +1,4 @@
-# In order to use fido2luks add 'keyscript=/lib/fido2luks/keyscript.sh'
+# In order to use fido2luks add 'keyscript=/usr/lib/fido2luks/keyscript.sh'
# and run update-initramfs -u
-<device>_crypt UUID=<LUKS-VOLUME-UUID> none luks,keyscript=/lib/fido2luks/keyscript.sh
+<device>_crypt UUID=<LUKS-VOLUME-UUID> none luks,keyscript=/usr/lib/fido2luks/keyscript.sh
Index: fido2luks/initramfs-hook
===================================================================
--- fido2luks.orig/initramfs-hook
+++ fido2luks/initramfs-hook
@@ -16,6 +16,6 @@ esac
. "${CONFDIR}/initramfs.conf"
. /usr/share/initramfs-tools/hook-functions
-copy_exec /usr/bin/fido2-assert /bin
-copy_exec /usr/bin/fido2-token /bin
-copy_exec /usr/bin/jq /bin
+copy_exec /usr/bin/fido2-assert
+copy_exec /usr/bin/fido2-token
+copy_exec /usr/bin/jq
Index: fido2luks/keyscript.sh
===================================================================
--- fido2luks.orig/keyscript.sh
+++ fido2luks/keyscript.sh
@@ -114,4 +114,4 @@ if try_fido2_unlock; then
fi
echo "*** Unlocking $CRYPTTAB_NAME using a regular passphrase" >&2
-/lib/cryptsetup/askpass "Enter passphrase: "
+/usr/lib/cryptsetup/askpass "Enter passphrase: "
|
