From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id CAC3C158030 for ; Tue, 28 Feb 2023 15:40:49 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 2946DE0391; Tue, 28 Feb 2023 15:40:49 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 100F5E0391 for ; Tue, 28 Feb 2023 15:40:49 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id DF2DE33FEFB for ; Tue, 28 Feb 2023 15:40:47 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 9491B75 for ; Tue, 28 Feb 2023 15:40:45 +0000 (UTC) From: "Ben Kohler" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Ben Kohler" Message-ID: <1677598839.cd6dc648847c71be099f47a2304e131c5249fe43.bkohler@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-misc/connman/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-misc/connman/connman-1.42_pre20230116-r1.ebuild net-misc/connman/connman-1.42_pre20230116-r2.ebuild X-VCS-Directories: net-misc/connman/ X-VCS-Committer: bkohler X-VCS-Committer-Name: Ben Kohler X-VCS-Revision: cd6dc648847c71be099f47a2304e131c5249fe43 X-VCS-Branch: master Date: Tue, 28 Feb 2023 15:40:45 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 0288e19d-1d3d-453e-9c87-78ccb01b3dd6 X-Archives-Hash: ec39e6a340f3a96ddd58453e5fd8c45f commit: cd6dc648847c71be099f47a2304e131c5249fe43 Author: Ben Kohler gentoo org> AuthorDate: Tue Feb 28 15:39:58 2023 +0000 Commit: Ben Kohler gentoo 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 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() {