Adding upstream version 060+5.upstream/060+5

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

3 files changed, 86 insertions, 0 deletions

diff --git a/modules.d/91pcsc/module-setup.sh b/modules.d/91pcsc/module-setup.sh
new file mode 100755
index 0000000..6f8b2c8
--- /dev/null
+++ b/modules.d/91pcsc/module-setup.sh
@@ -0,0 +1,62 @@
+#!/bin/bash
+# This file is part of dracut.
+# SPDX-License-Identifier: GPL-2.0-or-later
+
+# Prerequisite check(s) for module.
+check() {
+
+    # If the binary(s) requirements are not fulfilled the module can't be installed.
+    require_binaries pcscd || return 1
+
+    # Return 255 to only include the module, if another module requires it.
+    return 255
+
+}
+
+# Module dependency requirements.
+depends() {
+
+    # This module has external dependency on other module(s).
+    echo systemd-udevd
+    # Return 0 to include the dependent module(s) in the initramfs.
+    return 0
+
+}
+
+# Install the required file(s) and directories for the module in the initramfs.
+install() {
+    inst_simple "$moddir/pcscd.service" "${systemdsystemunitdir}"/pcscd.service
+    inst_simple "$moddir/pcscd.socket" "${systemdsystemunitdir}"/pcscd.socket
+
+    inst_multiple -o \
+        pcscd
+
+    # Enable systemd type unit(s)
+    for i in \
+        pcscd.service \
+        pcscd.socket; do
+        $SYSTEMCTL -q --root "$initdir" enable "$i"
+    done
+
+    # Install library file(s)
+    _arch=${DRACUT_ARCH:-$(uname -m)}
+    inst_libdir_file \
+        {"tls/$_arch/",tls/,"$_arch/",}"libopensc.so.*" \
+        {"tls/$_arch/",tls/,"$_arch/",}"libsmm-local.so.*" \
+        {"tls/$_arch/",tls/,"$_arch/",}"opensc-pkcs11.so" \
+        {"tls/$_arch/",tls/,"$_arch/",}"onepin-opensc-pkcs11.so" \
+        {"tls/$_arch/",tls/,"$_arch/",}"pkcs11/opensc-pkcs11.so" \
+        {"tls/$_arch/",tls/,"$_arch/",}"pkcs11/onepin-opensc-pkcs11.so" \
+        {"tls/$_arch/",tls/,"$_arch/",}"pcsc/drivers/ifd-ccid.bundle/Contents/Info.plist" \
+        {"tls/$_arch/",tls/,"$_arch/",}"pcsc/drivers/ifd-ccid.bundle/Contents/Linux/libccid.so" \
+        {"tls/$_arch/",tls/,"$_arch/",}"pcsc/drivers/serial/libccidtwin.so" \
+        {"tls/$_arch/",tls/,"$_arch/",}"libpcsclite.so.*"
+
+    # Install the hosts local user configurations if enabled.
+    if [[ $hostonly ]]; then
+        inst_multiple -H -o \
+            /etc/opensc.conf \
+            "/etc/reader.conf.d/*"
+    fi
+
+}
diff --git a/modules.d/91pcsc/pcscd.service b/modules.d/91pcsc/pcscd.service
new file mode 100644
index 0000000..639decd
--- /dev/null
+++ b/modules.d/91pcsc/pcscd.service
@@ -0,0 +1,13 @@
+[Unit]
+DefaultDependencies=no
+Description=PC/SC Smart Card Daemon (Dracut)
+Documentation=man:pcscd(8)
+Requires=pcscd.socket
+
+[Service]
+ExecStart=/usr/sbin/pcscd --foreground --auto-exit
+ExecReload=/usr/sbin/pcscd --hotplug
+
+[Install]
+Also=pcscd.socket
+WantedBy=cryptsetup-pre.target
diff --git a/modules.d/91pcsc/pcscd.socket b/modules.d/91pcsc/pcscd.socket
new file mode 100644
index 0000000..b20dd5a
--- /dev/null
+++ b/modules.d/91pcsc/pcscd.socket
@@ -0,0 +1,11 @@
+[Unit]
+DefaultDependencies=no
+Description=PC/SC Smart Card Daemon Activation Socket (Dracut)
+Documentation=man:pcscd(8)
+
+[Socket]
+ListenStream=/run/pcscd/pcscd.comm
+SocketMode=0666
+
+[Install]
+WantedBy=cryptsetup-pre.target sockets.target