| 1 |
commit: b013ca92c618cb735ec189768d70c21e8471e0d9 |
| 2 |
Author: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Aug 30 22:25:11 2020 +0000 |
| 4 |
Commit: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Aug 30 22:25:51 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b013ca92 |
| 7 |
|
| 8 |
sys-fs/zfs: don't print openrc-specific message for systemd users |
| 9 |
|
| 10 |
Package-Manager: Portage-3.0.4, Repoman-3.0.1 |
| 11 |
Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org> |
| 12 |
|
| 13 |
sys-fs/zfs/zfs-9999.ebuild | 21 +++++++++++++-------- |
| 14 |
1 file changed, 13 insertions(+), 8 deletions(-) |
| 15 |
|
| 16 |
diff --git a/sys-fs/zfs/zfs-9999.ebuild b/sys-fs/zfs/zfs-9999.ebuild |
| 17 |
index 1a24ecab027..7def7111301 100644 |
| 18 |
--- a/sys-fs/zfs/zfs-9999.ebuild |
| 19 |
+++ b/sys-fs/zfs/zfs-9999.ebuild |
| 20 |
@@ -207,14 +207,19 @@ pkg_postinst() { |
| 21 |
update_moduledb |
| 22 |
fi |
| 23 |
|
| 24 |
- [[ -e "${EROOT}/etc/runlevels/boot/zfs-import" ]] || \ |
| 25 |
- einfo "You should add zfs-import to the boot runlevel." |
| 26 |
- [[ -e "${EROOT}/etc/runlevels/boot/zfs-mount" ]]|| \ |
| 27 |
- einfo "You should add zfs-mount to the boot runlevel." |
| 28 |
- [[ -e "${EROOT}/etc/runlevels/default/zfs-share" ]] || \ |
| 29 |
- einfo "You should add zfs-share to the default runlevel." |
| 30 |
- [[ -e "${EROOT}/etc/runlevels/default/zfs-zed" ]] || \ |
| 31 |
- einfo "You should add zfs-zed to the default runlevel." |
| 32 |
+ if systemd_is_booted || has_version sys-apps/systemd; then |
| 33 |
+ einfo "Please refer to ${EROOT}/lib/systemd/system-preset/50-zfs.preset" |
| 34 |
+ einfo "for default zfs systemd service configuration" |
| 35 |
+ else |
| 36 |
+ [[ -e "${EROOT}/etc/runlevels/boot/zfs-import" ]] || \ |
| 37 |
+ einfo "You should add zfs-import to the boot runlevel." |
| 38 |
+ [[ -e "${EROOT}/etc/runlevels/boot/zfs-mount" ]]|| \ |
| 39 |
+ einfo "You should add zfs-mount to the boot runlevel." |
| 40 |
+ [[ -e "${EROOT}/etc/runlevels/default/zfs-share" ]] || \ |
| 41 |
+ einfo "You should add zfs-share to the default runlevel." |
| 42 |
+ [[ -e "${EROOT}/etc/runlevels/default/zfs-zed" ]] || \ |
| 43 |
+ einfo "You should add zfs-zed to the default runlevel." |
| 44 |
+ fi |
| 45 |
} |
| 46 |
|
| 47 |
pkg_postrm() { |
Archives