commit: 4ab9acecb1933be12a68032aa6d1fba06c4c642e Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Thu May 5 01:35:00 2022 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Thu May 5 01:35:00 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4ab9acec
net-analyzer/darkstat: simplify chroot logic It's easier to just print the default value and let the user handle the rest. Signed-off-by: Sam James <sam <AT> gentoo.org> .../{darkstat-3.0.721.ebuild => darkstat-3.0.721-r1.ebuild} | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/net-analyzer/darkstat/darkstat-3.0.721.ebuild b/net-analyzer/darkstat/darkstat-3.0.721-r1.ebuild similarity index 82% rename from net-analyzer/darkstat/darkstat-3.0.721.ebuild rename to net-analyzer/darkstat/darkstat-3.0.721-r1.ebuild index dcd53be61eb1..3f38088b33e0 100644 --- a/net-analyzer/darkstat/darkstat-3.0.721.ebuild +++ b/net-analyzer/darkstat/darkstat-3.0.721-r1.ebuild @@ -61,20 +61,12 @@ src_install() { } pkg_postinst() { - # Workaround bug #141619 - DARKSTAT_CHROOT_DIR=$( - sed -n 's/^#CHROOT=\(.*\)/\1/p' "${EROOT}"/etc/conf.d/darkstat - ) - - if [[ -n "${DARKSTAT_CHROOT_DIR}" ]] && [[ "${DARKSTAT_CHROOT_DIR}" != "${EROOT:-/}" ]] ; then - chown darkstat:0 "${EROOT}/${DARKSTAT_CHROOT_DIR#/}/" - fi - elog "To start different darkstat instances which will listen on a different" elog "interface, create within the ${EROOT}/etc/init.d directory a 'darkstat.if' symlink to" elog "darkstat script where 'if' is the name of the interface." elog "Also in the ${EROOT}/etc/conf.d directory, copy darkstat to darkstat.if" elog "and edit it to change default values." elog - elog "darkstat's default chroot directory is: ${EROOT}/${DARKSTAT_CHROOT_DIR#/}" + elog "darkstat's default chroot directory is: ${EROOT}/var/lib/darkstat." + elog "Please chown it to darkstat:0 (or a different directory if you change it)." }