| 1 |
commit: cd6dc648847c71be099f47a2304e131c5249fe43 |
| 2 |
Author: Ben Kohler <bkohler <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Feb 28 15:39:58 2023 +0000 |
| 4 |
Commit: Ben Kohler <bkohler <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Feb 28 15:40:39 2023 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cd6dc648 |
| 7 |
|
| 8 |
net-misc/connman: move iwd cmdline parameter from conf.d to init.d |
| 9 |
|
| 10 |
Bug: https://bugs.gentoo.org/897742 |
| 11 |
|
| 12 |
Signed-off-by: Ben Kohler <bkohler <AT> gentoo.org> |
| 13 |
|
| 14 |
...2_pre20230116-r1.ebuild => connman-1.42_pre20230116-r2.ebuild} | 8 +++----- |
| 15 |
1 file changed, 3 insertions(+), 5 deletions(-) |
| 16 |
|
| 17 |
diff --git a/net-misc/connman/connman-1.42_pre20230116-r1.ebuild b/net-misc/connman/connman-1.42_pre20230116-r2.ebuild |
| 18 |
similarity index 94% |
| 19 |
rename from net-misc/connman/connman-1.42_pre20230116-r1.ebuild |
| 20 |
rename to net-misc/connman/connman-1.42_pre20230116-r2.ebuild |
| 21 |
index 2f464d316e0d..d1dc59e3b63c 100644 |
| 22 |
--- a/net-misc/connman/connman-1.42_pre20230116-r1.ebuild |
| 23 |
+++ b/net-misc/connman/connman-1.42_pre20230116-r2.ebuild |
| 24 |
@@ -59,14 +59,12 @@ src_prepare() { |
| 25 |
default |
| 26 |
eautoreconf |
| 27 |
|
| 28 |
- cp "${FILESDIR}"/connman.initd2 "${FILESDIR}"/connman.confd "${T}" |
| 29 |
+ cp "${FILESDIR}"/connman.initd2 "${T}" |
| 30 |
if use iwd; then |
| 31 |
sed -i \ |
| 32 |
-e "s/need dbus/need dbus iwd/" \ |
| 33 |
+ -e '/start-stop-daemon --start/ s/ -- / -- --wifi=iwd_agent /' \ |
| 34 |
"${T}"/connman.initd2 || die |
| 35 |
- sed -i \ |
| 36 |
- -e 's/CONNMAN_OPTS=""/CONNMAN_OPTS="--wifi=iwd_agent"/' \ |
| 37 |
- "${T}"/connman.confd || die |
| 38 |
sed -i \ |
| 39 |
-e "/^ExecStart/ s/$/ --wifi=iwd_agent/" \ |
| 40 |
src/connman.service.in || die |
| 41 |
@@ -125,7 +123,7 @@ src_install() { |
| 42 |
keepdir /usr/lib/${PN}/scripts |
| 43 |
keepdir /var/lib/${PN} |
| 44 |
newinitd "${T}"/${PN}.initd2 ${PN} |
| 45 |
- newconfd "${T}"/${PN}.confd ${PN} |
| 46 |
+ newconfd "${FILESDIR}"/${PN}.confd ${PN} |
| 47 |
} |
| 48 |
|
| 49 |
pkg_postinst() { |
Archives