commit: cd6dc648847c71be099f47a2304e131c5249fe43 Author: Ben Kohler <bkohler <AT> gentoo <DOT> org> AuthorDate: Tue Feb 28 15:39:58 2023 +0000 Commit: Ben Kohler <bkohler <AT> gentoo <DOT> org> CommitDate: Tue Feb 28 15:40:39 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cd6dc648
net-misc/connman: move iwd cmdline parameter from conf.d to init.d Bug: https://bugs.gentoo.org/897742 Signed-off-by: Ben Kohler <bkohler <AT> gentoo.org> ...2_pre20230116-r1.ebuild => connman-1.42_pre20230116-r2.ebuild} | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/net-misc/connman/connman-1.42_pre20230116-r1.ebuild b/net-misc/connman/connman-1.42_pre20230116-r2.ebuild similarity index 94% rename from net-misc/connman/connman-1.42_pre20230116-r1.ebuild rename to net-misc/connman/connman-1.42_pre20230116-r2.ebuild index 2f464d316e0d..d1dc59e3b63c 100644 --- a/net-misc/connman/connman-1.42_pre20230116-r1.ebuild +++ b/net-misc/connman/connman-1.42_pre20230116-r2.ebuild @@ -59,14 +59,12 @@ src_prepare() { default eautoreconf - cp "${FILESDIR}"/connman.initd2 "${FILESDIR}"/connman.confd "${T}" + cp "${FILESDIR}"/connman.initd2 "${T}" if use iwd; then sed -i \ -e "s/need dbus/need dbus iwd/" \ + -e '/start-stop-daemon --start/ s/ -- / -- --wifi=iwd_agent /' \ "${T}"/connman.initd2 || die - sed -i \ - -e 's/CONNMAN_OPTS=""/CONNMAN_OPTS="--wifi=iwd_agent"/' \ - "${T}"/connman.confd || die sed -i \ -e "/^ExecStart/ s/$/ --wifi=iwd_agent/" \ src/connman.service.in || die @@ -125,7 +123,7 @@ src_install() { keepdir /usr/lib/${PN}/scripts keepdir /var/lib/${PN} newinitd "${T}"/${PN}.initd2 ${PN} - newconfd "${T}"/${PN}.confd ${PN} + newconfd "${FILESDIR}"/${PN}.confd ${PN} } pkg_postinst() {
