Date: Wednesday, March 8, 2023 @ 15:12:13
Author: eworm
Revision: 470420
add dlopen()ed libraries into initcpio
Modified:
systemd/trunk/PKGBUILD
systemd/trunk/initcpio-install-systemd
--------------------------+
PKGBUILD | 2 -
initcpio-install-systemd | 88 +++++++++++++++++++++++++--------------------
2 files changed, 51 insertions(+), 39 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2023-03-08 15:10:19 UTC (rev 470419)
+++ PKGBUILD 2023-03-08 15:12:13 UTC (rev 470420)
@@ -48,7 +48,7 @@
'SKIP'
'3ccf783c28f7a1c857120abac4002ca91ae1f92205dcd5a84aff515d57e706a3f9240d75a0a67cff5085716885e06e62597baa86897f298662ec36a940cf410e'
'f0d933e8c6064ed830dec54049b0a01e27be87203208f6ae982f10fb4eddc7258cb2919d594cbfb9a33e74c3510cfd682f3416ba8e804387ab87d1a217eb4b73'
-
'c6c30042b9f11c04e4430a4f45cce09c2dcc706bac567d7f8ec93b92ef791cd726d81c5b7d5468b350377f6338fa24d39c1ee8f4e8ce5826a61f4a9d4de4b25b'
+
'cae040e99cc3270ddb208f8453d03c0f7cc441a35ad27b19c14e8d44d6757bc7ade7dbdb8c76de97eee67c64f267724b4e7727b708c6ae05a7effc7e3873f8c5'
'a8c7e4a2cc9c9987e3c957a1fc3afe8281f2281fffd2e890913dcf00cf704024fb80d86cb75f9314b99b0e03bac275b22de93307bfc226d8be9435497e95b7e6'
'61032d29241b74a0f28446f8cf1be0e8ec46d0847a61dadb2a4f096e8686d5f57fe5c72bcf386003f6520bc4b5856c32d63bf3efe7eb0bc0deefc9f68159e648'
'c416e2121df83067376bcaacb58c05b01990f4614ad9de657d74b6da3efa441af251d13bf21e3f0f71ddcb4c9ea658b81da3d915667dc5c309c87ec32a1cb5a5'
Modified: initcpio-install-systemd
===================================================================
--- initcpio-install-systemd 2023-03-08 15:10:19 UTC (rev 470419)
+++ initcpio-install-systemd 2023-03-08 15:12:13 UTC (rev 470420)
@@ -77,48 +77,60 @@
/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 \
- [email protected] \
- [email protected] \
- 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 \
+ [email protected] \
+ [email protected] \
+ 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 systemd-pcrphase
+ for LIB in tss2-{esys,rc,mu}; 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"
