| 1 |
commit: 590917dadcf1f332666a31ec18e02776d3a00e14 |
| 2 |
Author: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Aug 30 22:49:41 2020 +0000 |
| 4 |
Commit: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Aug 30 22:49:56 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=590917da |
| 7 |
|
| 8 |
sys-fs/zfs: backport new systemd message to releases |
| 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-0.8.4-r2.ebuild | 21 +++++++++++++-------- |
| 14 |
sys-fs/zfs/zfs-2.0.0_rc1-r1.ebuild | 21 +++++++++++++-------- |
| 15 |
2 files changed, 26 insertions(+), 16 deletions(-) |
| 16 |
|
| 17 |
diff --git a/sys-fs/zfs/zfs-0.8.4-r2.ebuild b/sys-fs/zfs/zfs-0.8.4-r2.ebuild |
| 18 |
index 6b30ef219ee..5501d0e9c67 100644 |
| 19 |
--- a/sys-fs/zfs/zfs-0.8.4-r2.ebuild |
| 20 |
+++ b/sys-fs/zfs/zfs-0.8.4-r2.ebuild |
| 21 |
@@ -201,14 +201,19 @@ pkg_postinst() { |
| 22 |
update_moduledb |
| 23 |
fi |
| 24 |
|
| 25 |
- [[ -e "${EROOT}/etc/runlevels/boot/zfs-import" ]] || \ |
| 26 |
- einfo "You should add zfs-import to the boot runlevel." |
| 27 |
- [[ -e "${EROOT}/etc/runlevels/boot/zfs-mount" ]]|| \ |
| 28 |
- einfo "You should add zfs-mount to the boot runlevel." |
| 29 |
- [[ -e "${EROOT}/etc/runlevels/default/zfs-share" ]] || \ |
| 30 |
- einfo "You should add zfs-share to the default runlevel." |
| 31 |
- [[ -e "${EROOT}/etc/runlevels/default/zfs-zed" ]] || \ |
| 32 |
- einfo "You should add zfs-zed to the default runlevel." |
| 33 |
+ if systemd_is_booted || has_version sys-apps/systemd; then |
| 34 |
+ einfo "Please refer to ${EROOT}/lib/systemd/system-preset/50-zfs.preset" |
| 35 |
+ einfo "for default zfs systemd service configuration" |
| 36 |
+ else |
| 37 |
+ [[ -e "${EROOT}/etc/runlevels/boot/zfs-import" ]] || \ |
| 38 |
+ einfo "You should add zfs-import to the boot runlevel." |
| 39 |
+ [[ -e "${EROOT}/etc/runlevels/boot/zfs-mount" ]]|| \ |
| 40 |
+ einfo "You should add zfs-mount to the boot runlevel." |
| 41 |
+ [[ -e "${EROOT}/etc/runlevels/default/zfs-share" ]] || \ |
| 42 |
+ einfo "You should add zfs-share to the default runlevel." |
| 43 |
+ [[ -e "${EROOT}/etc/runlevels/default/zfs-zed" ]] || \ |
| 44 |
+ einfo "You should add zfs-zed to the default runlevel." |
| 45 |
+ fi |
| 46 |
} |
| 47 |
|
| 48 |
pkg_postrm() { |
| 49 |
|
| 50 |
diff --git a/sys-fs/zfs/zfs-2.0.0_rc1-r1.ebuild b/sys-fs/zfs/zfs-2.0.0_rc1-r1.ebuild |
| 51 |
index 55317293ed4..486de47acc4 100644 |
| 52 |
--- a/sys-fs/zfs/zfs-2.0.0_rc1-r1.ebuild |
| 53 |
+++ b/sys-fs/zfs/zfs-2.0.0_rc1-r1.ebuild |
| 54 |
@@ -206,14 +206,19 @@ pkg_postinst() { |
| 55 |
update_moduledb |
| 56 |
fi |
| 57 |
|
| 58 |
- [[ -e "${EROOT}/etc/runlevels/boot/zfs-import" ]] || \ |
| 59 |
- einfo "You should add zfs-import to the boot runlevel." |
| 60 |
- [[ -e "${EROOT}/etc/runlevels/boot/zfs-mount" ]]|| \ |
| 61 |
- einfo "You should add zfs-mount to the boot runlevel." |
| 62 |
- [[ -e "${EROOT}/etc/runlevels/default/zfs-share" ]] || \ |
| 63 |
- einfo "You should add zfs-share to the default runlevel." |
| 64 |
- [[ -e "${EROOT}/etc/runlevels/default/zfs-zed" ]] || \ |
| 65 |
- einfo "You should add zfs-zed to the default runlevel." |
| 66 |
+ if systemd_is_booted || has_version sys-apps/systemd; then |
| 67 |
+ einfo "Please refer to ${EROOT}/lib/systemd/system-preset/50-zfs.preset" |
| 68 |
+ einfo "for default zfs systemd service configuration" |
| 69 |
+ else |
| 70 |
+ [[ -e "${EROOT}/etc/runlevels/boot/zfs-import" ]] || \ |
| 71 |
+ einfo "You should add zfs-import to the boot runlevel." |
| 72 |
+ [[ -e "${EROOT}/etc/runlevels/boot/zfs-mount" ]]|| \ |
| 73 |
+ einfo "You should add zfs-mount to the boot runlevel." |
| 74 |
+ [[ -e "${EROOT}/etc/runlevels/default/zfs-share" ]] || \ |
| 75 |
+ einfo "You should add zfs-share to the default runlevel." |
| 76 |
+ [[ -e "${EROOT}/etc/runlevels/default/zfs-zed" ]] || \ |
| 77 |
+ einfo "You should add zfs-zed to the default runlevel." |
| 78 |
+ fi |
| 79 |
} |
| 80 |
|
| 81 |
pkg_postrm() { |
Archives