diff options
| author | Martijn Braam <martijn@brixit.nl> | 2019-08-05 21:33:35 +0200 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2019-08-16 17:59:04 +0000 |
| commit | be27851dffcfb0d3ddf656ff1798f7838bdcbb62 (patch) | |
| tree | 94d78b54e2658f8b0dbc9acb1098cf62920d8bdb /community/networkmanager | |
| parent | 0af28001a2b00ba84e069927f77fedebe40e7138 (diff) | |
| download | aports-be27851dffcfb0d3ddf656ff1798f7838bdcbb62.tar.bz2 aports-be27851dffcfb0d3ddf656ff1798f7838bdcbb62.tar.xz | |
community/networkmanager: remove iwd dependency
This reverts commit 54ad8af826871c04215055e2e60d811581742f21.
Diffstat (limited to 'community/networkmanager')
| -rw-r--r-- | community/networkmanager/APKBUILD | 12 | ||||
| -rw-r--r-- | community/networkmanager/networkmanager.pre-install | 4 |
2 files changed, 9 insertions, 7 deletions
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 |