diff options
| -rw-r--r-- | mkinitcpio-pkcs11/.SRCINFO | 7 | ||||
| -rw-r--r-- | mkinitcpio-pkcs11/PKGBUILD | 19 | ||||
| -rw-r--r-- | mkinitcpio-pkcs11/pkcs11_install | 21 |
3 files changed, 29 insertions, 18 deletions
diff --git a/mkinitcpio-pkcs11/.SRCINFO b/mkinitcpio-pkcs11/.SRCINFO index 1810e67..eb0eca5 100644 --- a/mkinitcpio-pkcs11/.SRCINFO +++ b/mkinitcpio-pkcs11/.SRCINFO @@ -1,16 +1,13 @@ pkgbase = mkinitcpio-pkcs11 pkgdesc = Install pkcs11 in early boot (systemd cryptsetyp.target) using pcscd.socket - pkgver = 0.3 + pkgver = 0.4 pkgrel = 1 arch = any depends = ccid depends = opensc depends = pcsclite depends = p11-kit - depends = gnutls source = pkcs11_install - source = opensc.module - sha256sums = 0c62dd5eb978268ed13be851b9ac46dee9aaa52c655061da5ece4c69ab4ff8f7 - sha256sums = fea71e2e2c1853bba034106d4eb40646a787ed900fef883e09d38dcb29675db4 + sha256sums = 503cbfab1e3271653e4d36bf33d35db3e21c76e4b454f7739691b10738876e03 pkgname = mkinitcpio-pkcs11 diff --git a/mkinitcpio-pkcs11/PKGBUILD b/mkinitcpio-pkcs11/PKGBUILD index d75729a..ed5febf 100644 --- a/mkinitcpio-pkcs11/PKGBUILD +++ b/mkinitcpio-pkcs11/PKGBUILD @@ -1,16 +1,17 @@ +# Maintainer: Tharre <tharre3@gmail.com> + pkgname=mkinitcpio-pkcs11 -pkgver=0.3 +pkgver=0.4 pkgrel=1 pkgdesc='Install pkcs11 in early boot (systemd cryptsetyp.target) using pcscd.socket' -depends=('ccid' 'opensc' 'pcsclite' 'p11-kit' 'gnutls') +depends=('ccid' 'opensc' 'pcsclite' 'p11-kit') arch=('any') -source=('pkcs11_install' 'opensc.module') -sha256sums=( - '0c62dd5eb978268ed13be851b9ac46dee9aaa52c655061da5ece4c69ab4ff8f7' - 'fea71e2e2c1853bba034106d4eb40646a787ed900fef883e09d38dcb29675db4' -) +source=('pkcs11_install') +sha256sums=('503cbfab1e3271653e4d36bf33d35db3e21c76e4b454f7739691b10738876e03') package() { - install -D -m644 "pkcs11_install" "$pkgdir/usr/lib/initcpio/install/pkcs11" - install -D -m644 "opensc.module" "$pkgdir/etc/pkcs11/modules/opensc.module" + install -Dm644 pkcs11_install "$pkgdir/usr/lib/initcpio/install/pkcs11" + install -Dm644 /dev/stdin "$pkgdir/etc/pkcs11/modules/opensc.module" <<EOF +module: opensc-pkcs11.so +EOF } diff --git a/mkinitcpio-pkcs11/pkcs11_install b/mkinitcpio-pkcs11/pkcs11_install index 0643423..d363270 100644 --- a/mkinitcpio-pkcs11/pkcs11_install +++ b/mkinitcpio-pkcs11/pkcs11_install @@ -1,7 +1,6 @@ #!/bin/bash build() { - # CCID add_file /etc/libccid_Info.plist add_file /etc/reader.conf.d/libccidtwin @@ -18,14 +17,28 @@ build() { add_binary /usr/lib/libpcsclite.so # PCSCD at boot before cryptsetup + add_systemd_drop_in pcscd.service override <<'EOF' +[Unit] +DefaultDependencies=no + +[Service] +ExecStart= +ExecStart=/usr/bin/pcscd --foreground --disable-polkit --auto-exit $PCSCD_ARGS +EOF + add_systemd_drop_in pcscd.socket override <<'EOF' +[Unit] +DefaultDependencies=no +Before=cryptsetup.target + +[Install] +RequiredBy=cryptsetup.target +EOF add_systemd_unit pcscd.service - add_systemd_unit pcscd.socket - add_symlink /usr/lib/systemd/system/cryptsetup.target.wants/pcscd.socket ../pcscd.socket + add_symlink /usr/lib/systemd/system/cryptsetup.target.requires/pcscd.socket ../pcscd.socket # MISC add_binary /usr/bin/p11tool add_file /etc/pkcs11/modules/opensc.module - } help() { |