diff options
| author |   Georgy Yakovlev <ya@sysdump.net> | 2018-03-07 19:33:42 -0800 |
|---|---|---|
| committer |   Matthew Thode <prometheanfire@gentoo.org> | 2018-03-08 10:20:41 -0600 |
| commit | b976c04437daee44030ddd28f757a7df1ae5df45 (patch) | |
| tree | 13e2b6a63310b9d675acf491241e65ea11ab46ca /sys-fs/zfs/zfs-0.7.6-r1.ebuild | |
| parent | sys-fs/zfs: fix dracut module path (diff) | |
| download | gentoo-b976c04437daee44030ddd28f757a7df1ae5df45.tar.gz gentoo-b976c04437daee44030ddd28f757a7df1ae5df45.tar.bz2 gentoo-b976c04437daee44030ddd28f757a7df1ae5df45.zip | |
sys-fs/zfs: fix systemd related installation paths
ebuilds intalls most systemd files into
/usr/lib/systemd
while it should be
/lib/systemd
qlist =sys-fs/zfs-0.7.6 | grep systemd
/usr/lib/systemd/system-preset/50-zfs.preset
/usr/lib/systemd/system/zfs-zed.service
/usr/lib/systemd/system/zfs-import-cache.service
/usr/lib/systemd/system/zfs-import-scan.service
/usr/lib/systemd/system/zfs-mount.service
/usr/lib/systemd/system/zfs-share.service
/usr/lib/systemd/system/zfs-import.target
/usr/lib/systemd/system/zfs.target
/lib/systemd/system/zfs.service < this is ok
The reason is that default values for:
--with-systemdpresetdir and
--with-systemdmodulesloaddir
point to /usr/lib/systemd
This commit overrides the location to to use
gentoo preferred /lib/systemd
Use systemd_reapply to re-create broken symlinks
Also fixes minor QA, no more --with-blkid switch
for 7.xx and live ebuilds.
Package-Manager: Portage-2.3.24, Repoman-2.3.6
Signed-off-by: Matthew Thode <prometheanfire@gentoo.org>
Diffstat (limited to 'sys-fs/zfs/zfs-0.7.6-r1.ebuild')
| -rw-r--r-- | sys-fs/zfs/zfs-0.7.6-r1.ebuild | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/sys-fs/zfs/zfs-0.7.6-r1.ebuild b/sys-fs/zfs/zfs-0.7.6-r1.ebuild index 118fe97e22a6..b625fe321e0f 100644 --- a/sys-fs/zfs/zfs-0.7.6-r1.ebuild +++ b/sys-fs/zfs/zfs-0.7.6-r1.ebuild @@ -105,7 +105,8 @@ src_configure() { --with-linux="${KV_DIR}" --with-linux-obj="${KV_OUT_DIR}" --with-udevdir="$(get_udevdir)" - --with-blkid + --with-systemdunitdir="$(systemd_get_systemunitdir)" + --with-systemdpresetdir="${EPREFIX}/lib/systemd/system-preset" $(use_enable debug) ) autotools-utils_src_configure @@ -192,6 +193,15 @@ pkg_postinst() { rm "${EROOT}etc/runlevels/shutdown/zfs-shutdown" fi + systemd_reenable zfs-zed.service + systemd_reenable zfs-import-cache.service + systemd_reenable zfs-import-scan.service + systemd_reenable zfs-mount.service + systemd_reenable zfs-share.service + systemd_reenable zfs-import.target + systemd_reenable zfs.target + systemd_reenable zfs.service + } pkg_postrm() { |