sync with testing/systemd

Signed-off-by: Yurii Kolesnykov <root@yurikoles.com>

1 files changed, 50 insertions, 38 deletions

diff --git a/initcpio-install-systemd b/initcpio-install-systemd
index c9aa0822b909..ff29d8c54a63 100644
--- a/initcpio-install-systemd
+++ b/initcpio-install-systemd
@@ -77,47 +77,59 @@ build() {
         /usr/lib/systemd/system-generators/systemd-gpt-auto-generator \
         /usr/lib/systemd/system-generators/systemd-hibernate-resume-generator
 
-    # udev rules and systemd units
+    # udev rules
     map add_udev_rule "$rules" \
-            50-udev-default.rules \
-            60-persistent-storage.rules \
-            64-btrfs.rules \
-            80-drivers.rules \
-            99-systemd.rules
+        50-udev-default.rules \
+        60-persistent-storage.rules \
+        64-btrfs.rules \
+        80-drivers.rules \
+        99-systemd.rules
 
+    # systemd units
     map add_systemd_unit \
-            initrd-cleanup.service \
-            initrd-fs.target \
-            initrd-parse-etc.service \
-            initrd-root-fs.target \
-            initrd-root-device.target \
-            initrd-switch-root.service \
-            initrd-switch-root.target \
-            initrd-udevadm-cleanup-db.service \
-            initrd.target \
-            kmod-static-nodes.service \
-            local-fs.target \
-            local-fs-pre.target \
-            paths.target \
-            reboot.target \
-            slices.target \
-            sockets.target \
-            swap.target \
-            systemd-fsck@.service \
-            systemd-hibernate-resume@.service \
-            systemd-journald-audit.socket \
-            systemd-journald-dev-log.socket \
-            systemd-journald.service \
-            systemd-modules-load.service \
-            systemd-pcrphase-initrd.service \
-            systemd-tmpfiles-setup-dev.service \
-            systemd-udevd-control.socket \
-            systemd-udevd-kernel.socket \
-            systemd-udevd.service \
-            systemd-udev-trigger.service \
-            timers.target \
-            rescue.target \
-            emergency.target
+        initrd-cleanup.service \
+        initrd-fs.target \
+        initrd-parse-etc.service \
+        initrd-root-fs.target \
+        initrd-root-device.target \
+        initrd-switch-root.service \
+        initrd-switch-root.target \
+        initrd-udevadm-cleanup-db.service \
+        initrd.target \
+        kmod-static-nodes.service \
+        local-fs.target \
+        local-fs-pre.target \
+        paths.target \
+        reboot.target \
+        slices.target \
+        sockets.target \
+        swap.target \
+        systemd-fsck@.service \
+        systemd-hibernate-resume@.service \
+        systemd-journald-audit.socket \
+        systemd-journald-dev-log.socket \
+        systemd-journald.service \
+        systemd-modules-load.service \
+        systemd-pcrphase-initrd.service \
+        systemd-tmpfiles-setup-dev.service \
+        systemd-udevd-control.socket \
+        systemd-udevd-kernel.socket \
+        systemd-udevd.service \
+        systemd-udev-trigger.service \
+        timers.target \
+        rescue.target \
+        emergency.target
+
+    # add libraries dlopen()ed by tpm2-util
+    for LIB in tss2-{esys,rc,mu,tcti-'*'}; do
+        for FILE in $(find /usr/lib/ -maxdepth 1 -name "lib${LIB}.so*"); do
+            if [[ -L "${FILE}" ]]; then
+                add_symlink "${FILE}"
+            else
+                add_binary "${FILE}"
+            fi
+        done
+    done
 
     add_symlink "/usr/lib/systemd/system/default.target" "initrd.target"
     add_symlink "/usr/lib/systemd/system/ctrl-alt-del.target" "reboot.target"