commit: d92dbeb600ab9c6f5fd10685c9733cfba3f74dc5 Author: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org> AuthorDate: Thu Dec 16 03:19:00 2021 +0000 Commit: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org> CommitDate: Thu Dec 16 03:26:45 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d92dbeb6
sys-fs/zfs: use $(systemd_get_systempresetdir) b8f91fee6a8314dc58c1da011b65d9b857ef963f introduced this eclass function, let's use it. Bug: https://bugs.gentoo.org/813639 Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org> sys-fs/zfs/zfs-0.8.6-r2.ebuild | 4 ++-- sys-fs/zfs/zfs-2.0.6-r1.ebuild | 4 ++-- sys-fs/zfs/zfs-2.1.1-r5.ebuild | 4 ++-- sys-fs/zfs/zfs-2.1.2-r1.ebuild | 4 ++-- sys-fs/zfs/zfs-9999.ebuild | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/sys-fs/zfs/zfs-0.8.6-r2.ebuild b/sys-fs/zfs/zfs-0.8.6-r2.ebuild index e75749620f17..df9295794bab 100644 --- a/sys-fs/zfs/zfs-0.8.6-r2.ebuild +++ b/sys-fs/zfs/zfs-0.8.6-r2.ebuild @@ -154,7 +154,7 @@ src_configure() { --with-linux-obj="${KV_OUT_DIR}" --with-udevdir="$(get_udevdir)" --with-systemdunitdir="$(systemd_get_systemunitdir)" - --with-systemdpresetdir="${EPREFIX}/lib/systemd/system-preset" + --with-systemdpresetdir="$(systemd_get_systempresetdir)" $(use_enable debug) $(use_enable nls) $(use_enable python pyzfs) @@ -225,7 +225,7 @@ pkg_postinst() { fi if systemd_is_booted || has_version sys-apps/systemd; then - einfo "Please refer to ${EROOT}/lib/systemd/system-preset/50-zfs.preset" + einfo "Please refer to ${EROOT}/$(systemd_get_systempresetdir)/50-zfs.preset" einfo "for default zfs systemd service configuration" else [[ -e "${EROOT}/etc/runlevels/boot/zfs-import" ]] || \ diff --git a/sys-fs/zfs/zfs-2.0.6-r1.ebuild b/sys-fs/zfs/zfs-2.0.6-r1.ebuild index 4dd040afa7af..92d40258e07e 100644 --- a/sys-fs/zfs/zfs-2.0.6-r1.ebuild +++ b/sys-fs/zfs/zfs-2.0.6-r1.ebuild @@ -206,7 +206,7 @@ src_configure() { --with-pamconfigsdir="${EPREFIX}/unwanted_files" --with-pammoduledir="$(getpam_mod_dir)" --with-systemdunitdir="$(systemd_get_systemunitdir)" - --with-systemdpresetdir="${EPREFIX}/lib/systemd/system-preset" + --with-systemdpresetdir="$(systemd_get_systempresetdir)" --with-vendor=gentoo $(use_enable debug) $(use_enable nls) @@ -281,7 +281,7 @@ pkg_postinst() { fi if systemd_is_booted || has_version sys-apps/systemd; then - einfo "Please refer to ${EROOT}/lib/systemd/system-preset/50-zfs.preset" + einfo "Please refer to ${EROOT}/$(systemd_get_systempresetdir)/50-zfs.preset" einfo "for default zfs systemd service configuration" else [[ -e "${EROOT}/etc/runlevels/boot/zfs-import" ]] || \ diff --git a/sys-fs/zfs/zfs-2.1.1-r5.ebuild b/sys-fs/zfs/zfs-2.1.1-r5.ebuild index e330b1315825..50f0cc6eb8cd 100644 --- a/sys-fs/zfs/zfs-2.1.1-r5.ebuild +++ b/sys-fs/zfs/zfs-2.1.1-r5.ebuild @@ -203,7 +203,7 @@ src_configure() { --with-pamconfigsdir="${EPREFIX}/unwanted_files" --with-pammoduledir="$(getpam_mod_dir)" --with-systemdunitdir="$(systemd_get_systemunitdir)" - --with-systemdpresetdir="${EPREFIX}/lib/systemd/system-preset" + --with-systemdpresetdir="$(systemd_get_systempresetdir)" --with-vendor=gentoo # Building zfs-mount-generator.c on musl breaks as strndupa # isn't available. But systemd doesn't support musl anyway, so @@ -282,7 +282,7 @@ pkg_postinst() { fi if systemd_is_booted || has_version sys-apps/systemd; then - einfo "Please refer to ${EROOT}/lib/systemd/system-preset/50-zfs.preset" + einfo "Please refer to ${EROOT}/$(systemd_get_systempresetdir)/50-zfs.preset" einfo "for default zfs systemd service configuration" else [[ -e "${EROOT}/etc/runlevels/boot/zfs-import" ]] || \ diff --git a/sys-fs/zfs/zfs-2.1.2-r1.ebuild b/sys-fs/zfs/zfs-2.1.2-r1.ebuild index 9f36bb2bf79b..72ad20735878 100644 --- a/sys-fs/zfs/zfs-2.1.2-r1.ebuild +++ b/sys-fs/zfs/zfs-2.1.2-r1.ebuild @@ -203,7 +203,7 @@ src_configure() { --with-pamconfigsdir="${EPREFIX}/unwanted_files" --with-pammoduledir="$(getpam_mod_dir)" --with-systemdunitdir="$(systemd_get_systemunitdir)" - --with-systemdpresetdir="${EPREFIX}/lib/systemd/system-preset" + --with-systemdpresetdir="$(systemd_get_systempresetdir)" --with-vendor=gentoo # Building zfs-mount-generator.c on musl breaks as strndupa # isn't available. But systemd doesn't support musl anyway, so @@ -282,7 +282,7 @@ pkg_postinst() { fi if systemd_is_booted || has_version sys-apps/systemd; then - einfo "Please refer to ${EROOT}/lib/systemd/system-preset/50-zfs.preset" + einfo "Please refer to ${EROOT}/$(systemd_get_systempresetdir)/50-zfs.preset" einfo "for default zfs systemd service configuration" else [[ -e "${EROOT}/etc/runlevels/boot/zfs-import" ]] || \ diff --git a/sys-fs/zfs/zfs-9999.ebuild b/sys-fs/zfs/zfs-9999.ebuild index 4f56f04e6ede..4aae1526e48a 100644 --- a/sys-fs/zfs/zfs-9999.ebuild +++ b/sys-fs/zfs/zfs-9999.ebuild @@ -198,7 +198,7 @@ src_configure() { --with-pamconfigsdir="${EPREFIX}/unwanted_files" --with-pammoduledir="$(getpam_mod_dir)" --with-systemdunitdir="$(systemd_get_systemunitdir)" - --with-systemdpresetdir="${EPREFIX}/lib/systemd/system-preset" + --with-systemdpresetdir="$(systemd_get_systempresetdir)" --with-vendor=gentoo # Building zfs-mount-generator.c on musl breaks as strndupa # isn't available. But systemd doesn't support musl anyway, so @@ -277,7 +277,7 @@ pkg_postinst() { fi if systemd_is_booted || has_version sys-apps/systemd; then - einfo "Please refer to ${EROOT}/lib/systemd/system-preset/50-zfs.preset" + einfo "Please refer to ${EROOT}/$(systemd_get_systempresetdir)/50-zfs.preset" einfo "for default zfs systemd service configuration" else [[ -e "${EROOT}/etc/runlevels/boot/zfs-import" ]] || \
