From: "Sam James" <sam@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: net-analyzer/darkstat/
Date: Thu, 5 May 2022 01:35:41 +0000 (UTC) [thread overview]
Message-ID: <1651714500.4ab9acecb1933be12a68032aa6d1fba06c4c642e.sam@gentoo> (raw)
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)."
}
next reply other threads:[~2022-05-05 1:35 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-05-05 1:35 Sam James [this message]
-- strict thread matches above, loose matches on Subject: below --
2022-12-18 19:36 [gentoo-commits] repo/gentoo:master commit in: net-analyzer/darkstat/ Arthur Zamarin
2022-05-04 4:23 Sam James
2022-05-04 4:23 Sam James
2022-05-04 4:23 Sam James
2021-03-15 22:02 Sam James
2021-03-15 21:54 Sam James
2021-03-15 21:25 Sam James
2021-03-15 21:25 Sam James
2020-10-03 15:30 David Seifert
2020-07-03 11:07 Jeroen Roovers
2020-07-03 9:55 Jeroen Roovers
2020-07-03 9:55 Jeroen Roovers
2017-03-08 5:03 Jeroen Roovers
2017-02-24 14:07 Agostino Sarubbo
2017-02-22 16:08 Agostino Sarubbo
2017-02-22 15:06 Agostino Sarubbo
2017-02-21 23:55 Jeroen Roovers
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1651714500.4ab9acecb1933be12a68032aa6d1fba06c4c642e.sam@gentoo \
--to=sam@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox