From be27851dffcfb0d3ddf656ff1798f7838bdcbb62 Mon Sep 17 00:00:00 2001
From: Martijn Braam <martijn@brixit.nl>
Date: Mon, 5 Aug 2019 21:33:35 +0200
Subject: community/networkmanager: remove iwd dependency

This reverts commit 54ad8af826871c04215055e2e60d811581742f21.
---
 community/networkmanager/APKBUILD                   | 12 ++++++------
 community/networkmanager/networkmanager.pre-install |  4 +++-
 2 files changed, 9 insertions(+), 7 deletions(-)

(limited to 'community')

diff --git a/community/networkmanager/APKBUILD b/community/networkmanager/APKBUILD
index 9ae7b8aea3..e385003ad4 100644
--- a/community/networkmanager/APKBUILD
+++ b/community/networkmanager/APKBUILD
@@ -2,12 +2,12 @@
 # Maintainer: Rasmus Thomsen <oss@cogitri.dev>
 pkgname=networkmanager
 pkgver=1.18.2
-pkgrel=2
+pkgrel=3
 pkgdesc="Network Management daemon"
 url="https://wiki.gnome.org/Projects/NetworkManager"
 arch="all !s390x" # Limited by iwd
 license="GPL-2.0-or-later"
-depends="dhcpcd iptables dbus iwd"
+depends="dhcpcd iptables dbus"
 install="$pkgname.pre-install $pkgname.pre-upgrade"
 makedepends="$depends_dev
 	curl-dev
@@ -99,11 +99,11 @@ package() {
 	mv "$pkgdir/usr/share/doc/NetworkManager" "$pkgdir/usr/share/doc/$pkgname"
 	cat > "$pkgdir"/usr/share/doc/$pkgname/README.alpine <<EOF
 To modify system network connections without the root password: add your user account to the 'plugdev' group, or use Polkit.
-EOF
 
-	cat > "$pkgdir"/etc/NetworkManager/conf.d/iwd.conf <<-EOF
-	[device]
-	wifi.backend=iwd
+To use iwd instead of the default wpa_supplicant install iwd, start its service and add the following to your /etc/NetworkManager/NetworkManager.conf:
+
+[device]
+wifi.backend=iwd
 EOF
 }
 
diff --git a/community/networkmanager/networkmanager.pre-install b/community/networkmanager/networkmanager.pre-install
index 266fb41248..26811dfb09 100644
--- a/community/networkmanager/networkmanager.pre-install
+++ b/community/networkmanager/networkmanager.pre-install
@@ -2,6 +2,8 @@
 
 addgroup -S plugdev 2>/dev/null
 
-printf "  *\n  * To setup system connections, regular users must either use Polkit for authentication or be a member of the 'plugdev' group."
+printf "  *\n  * To setup system connections, regular users must be member of 'plugdev' group.\n  *\n"
+printf "  *\n  * To control WiFi devices, enable wpa_supplicant service: 'rc-update add wpa_supplicant default'\n"
+printf "  * then reboot the system or restart 'wpa_supplicant' and 'networkmanager' services respectively.\n  *\n"
 
 exit 0
-- 
cgit v1.2.3