From b31a131eb36b656738bc35a4fc1c82e8041cb776 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=BD=D0=B0=D0=B1?= Date: Thu, 29 Feb 2024 01:25:32 +0100 Subject: [PATCH] It's /usr/share/tpfms obv --- Makefile | 4 ++-- init.d/systemd/libexec-tzpfms-zfs-load-key@.sh | 2 +- init.d/systemd/{usr-lib-tzpfms => usr-share-tzpfms}/TPM1.X | 0 init.d/systemd/{usr-lib-tzpfms => usr-share-tzpfms}/TPM2 | 0 4 files changed, 3 insertions(+), 3 deletions(-) rename init.d/systemd/{usr-lib-tzpfms => usr-share-tzpfms}/TPM1.X (100%) rename init.d/systemd/{usr-lib-tzpfms => usr-share-tzpfms}/TPM2 (100%) diff --git a/Makefile b/Makefile index 7a4b6dc..77fb2ff 100644 --- a/Makefile +++ b/Makefile @@ -88,7 +88,7 @@ htmlpages : $(patsubst man/%.pp,$(OUTDIR)man/%.html,$(MANPAGE_SOURCES)) $(OUTDIR locales : $(patsubst po/%.po,$(OUTDIR)locale/%/LC_MESSAGES/tzpfms.mo,$(LOCALES)) i-t : $(OUTDIR)initramfs-tools/usr/share/initramfs-tools/hooks/tzpfms $(OUTDIR)initramfs-tools/usr/share/tzpfms/initramfs-tools-zfs-patch.sh dracut : $(patsubst initrd/dracut/%,$(OUTDIR)dracut/usr/lib/dracut/modules.d/91tzpfms/%,$(sort $(wildcard initrd/dracut/*.sh))) -init.d-systemd : $(OUTDIR)systemd/$(SYSTEMD_SYSTEM_UNITDIR)/zfs-load-key@.service.d/tzpfms.conf $(OUTDIR)systemd/usr/libexec/tzpfms-zfs-load-key@ $(foreach l,$(subst init.d/systemd/usr-lib-tzpfms/,,$(wildcard init.d/systemd/usr-lib-tzpfms/*)),$(OUTDIR)systemd/usr/lib/tzpfms/$(l)) +init.d-systemd : $(OUTDIR)systemd/$(SYSTEMD_SYSTEM_UNITDIR)/zfs-load-key@.service.d/tzpfms.conf $(OUTDIR)systemd/usr/libexec/tzpfms-zfs-load-key@ $(foreach l,$(subst init.d/systemd/usr-share-tzpfms/,,$(wildcard init.d/systemd/usr-share-tzpfms/*)),$(OUTDIR)systemd/usr/share/tzpfms/$(l)) $(BLDDIR)tzpfms.pot: src/*.[ch]pp src/bin/*.[ch]pp @@ -120,7 +120,7 @@ $(OUTDIR)systemd/usr/libexec/tzpfms-zfs-load-key@ : init.d/systemd/libexec-tzpfm @mkdir -p $(dir $@) ln -f $< $@ || cp $< $@ -$(OUTDIR)systemd/usr/lib/tzpfms/% : init.d/systemd/usr-lib-tzpfms/% +$(OUTDIR)systemd/usr/share/tzpfms/% : init.d/systemd/usr-share-tzpfms/% @mkdir -p $(dir $@) ln -f $< $@ || cp $< $@ diff --git a/init.d/systemd/libexec-tzpfms-zfs-load-key@.sh b/init.d/systemd/libexec-tzpfms-zfs-load-key@.sh index d8efdb2..1a88129 100755 --- a/init.d/systemd/libexec-tzpfms-zfs-load-key@.sh +++ b/init.d/systemd/libexec-tzpfms-zfs-load-key@.sh @@ -13,7 +13,7 @@ zfs-tpm-list -H "$DSET" | while read -r _ backend keystatus coherent; do } unlock=; deps= - read -r unlock deps 2>/dev/null < "/usr/lib/tzpfms/$backend" + read -r unlock deps 2>/dev/null < "/usr/share/tzpfms/$backend" command -v "$unlock" >/dev/null || { printf "%s\n" "${0##*/}[$$]: $DSET: unknown tzpfms back-end $backend." >&2 exit # fall through, maybe there's another handler diff --git a/init.d/systemd/usr-lib-tzpfms/TPM1.X b/init.d/systemd/usr-share-tzpfms/TPM1.X similarity index 100% rename from init.d/systemd/usr-lib-tzpfms/TPM1.X rename to init.d/systemd/usr-share-tzpfms/TPM1.X diff --git a/init.d/systemd/usr-lib-tzpfms/TPM2 b/init.d/systemd/usr-share-tzpfms/TPM2 similarity index 100% rename from init.d/systemd/usr-lib-tzpfms/TPM2 rename to init.d/systemd/usr-share-tzpfms/TPM2