summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBen Kohler <bkohler@gentoo.org>2023-02-28 09:39:58 -0600
committerBen Kohler <bkohler@gentoo.org>2023-02-28 09:40:39 -0600
commitcd6dc648847c71be099f47a2304e131c5249fe43 (patch)
treea80b9c193d15099c45f897178fa636f7b605b1e0 /net-misc
parentprofiles: mask the latest vim stack due to syntax highlight issues (diff)
downloadgentoo-cd6dc648847c71be099f47a2304e131c5249fe43.tar.gz
gentoo-cd6dc648847c71be099f47a2304e131c5249fe43.tar.bz2
gentoo-cd6dc648847c71be099f47a2304e131c5249fe43.zip
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@gentoo.org>
Diffstat (limited to 'net-misc')
-rw-r--r--net-misc/connman/connman-1.42_pre20230116-r2.ebuild (renamed from net-misc/connman/connman-1.42_pre20230116-r1.ebuild)8
1 files 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
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,15 +59,13 @@ 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
fi
@@ -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() {