Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions .onedev-buildspec.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
version: 40
imports:
- projectPath: OpenMandriva/Packages
revision: mirroring
3 changes: 1 addition & 2 deletions 00-wifi-backend.conf
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
[device]
# IWD is in many ways better, but currently has problems
# with most non-Intel chipsets.
#wifi.backend=iwd
wifi.backend=wpa_supplicant
wifi.backend=iwd
15 changes: 11 additions & 4 deletions networkmanager.spec
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
Name: networkmanager
Summary: Network connection manager and user applications
Version: 1.26.2
Release: 1
Release: 2
Group: System/Base
License: GPLv2+
Url: http://www.gnome.org/projects/NetworkManager/
Expand Down Expand Up @@ -83,9 +83,8 @@ Requires: modemmanager
Requires: ppp = %{ppp_version}
Requires(post,preun,postun): rpm-helper
Requires: wireless-tools
# Once iwd becomes better than wireless-tools on non-Intel:
Requires: (wpa_supplicant or iwd)
Suggests: wpa_supplicant
Requires: iwd
Conflicts: wpa_supplicant
Recommends: nscd
Provides: NetworkManager = %{EVRD}
Obsoletes: dhcdbd
Expand Down Expand Up @@ -232,6 +231,14 @@ EOF
/usr/bin/udevadm control --reload-rules || :
/usr/bin/udevadm trigger --subsystem-match=net || :

# (tpg) make sure that IWD is default backend and restart NM
# this may be removed or changed after wpa_supplicant go away
%triggerin -- networkmanager < 1.26.2-2
sed -i -e 's/^wifi.backend=.*/wifi.backend=iwd/g' /usr/lib/NetworkManager/conf.d/00-wifi-backend.conf
sed -i -e 's/^#wifi.backend=.*//g' /usr/lib/NetworkManager/conf.d/00-wifi-backend.conf
systemctl restart --quiet iwd.service
systemctl restart --quiet NetworkManager.service

%files -f %{rname}.lang
%doc AUTHORS CONTRIBUTING NEWS README TODO
%{_sysconfdir}/dbus-1/system.d/org.freedesktop.NetworkManager.conf
Expand Down