libperry/pybatmesh
1
0
Fork 0
mirror of https://git.disroot.org/pranav/pybatmesh.git synced 2025-01-06 06:53:48 +05:30
Code Issues Actions Packages Projects Releases Wiki Activity

reverted the changes

Browse Source 
Instead, removed the wpa_supplicant "conflicts" line from naxalnet.service
This commit is contained in:
Pranav Jerry 2021-10-22 13:05:37 +05:30
parent 295fde3f0b
commit aa079c7c29
No known key found for this signature in database
GPG Key ID: F1DCDC4FED0A0C5B
6 changed files with 4 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -21,7 +21,7 @@ install:
uninstall: uninstall:
$(PIP) uninstall -y naxalnet $(PIP) uninstall -y naxalnet
rm -rf /usr/share/naxalnet /usr/lib/systemd/system/naxalnet.service /usr/lib/systemd/system/iwd.service.d/naxalnet.conf rm -rf /usr/share/naxalnet /usr/lib/systemd/system/naxalnet.service
@echo "make uninstall will not remove anything in /etc/naxalnet" && \ @echo "make uninstall will not remove anything in /etc/naxalnet" && \
echo "Do 'sudo make purge' to remove it." echo "Do 'sudo make purge' to remove it."

2
naxalnet/__init__.py
View File

@ -42,4 +42,4 @@ given below.
# #
# In case you forgot to change the version, skip the number # In case you forgot to change the version, skip the number
# and put the next number in the next commit. # and put the next number in the next commit.
__version__ = "0.5.0a1.dev4" __version__ = "0.5.0a1.dev5"

4
service/iwd.service.d/naxalnet.conf
View File

@ -1,4 +0,0 @@
[Unit]
# Fix for issue #21
Conflicts=wpa_supplicant.service
After=wpa_supplicant.service

8
service/naxalnet.service
View File

@ -4,19 +4,15 @@
[Unit] [Unit]
Description=Setup mesh networks Description=Setup mesh networks
Requires=systemd-networkd.service Requires=systemd-networkd.service
# See issue #21 to find out why we do not use Required for iwd Requires=iwd.service
Wants=iwd.service
Wants=systemd-resolved.service Wants=systemd-resolved.service
After=iwd.service After=iwd.service
After=systemd-networkd.service After=systemd-networkd.service
After=systemd-resolved.service After=systemd-resolved.service
# Stops NetworkManager and wpa_supplicant if already running # Stops NetworkManager if already running
Conflicts=NetworkManager.service Conflicts=NetworkManager.service
# Commented out for testing
#Conflicts=wpa_supplicant.service
# This stops networkmanager and wpa_supplicant when naxalnet is enabled # This stops networkmanager and wpa_supplicant when naxalnet is enabled
After=NetworkManager.service After=NetworkManager.service
#After=wpa_supplicant.service
[Service] [Service]
Type=notify Type=notify

3
service/wpa_supplicant.service.d/naxalnet.conf
View File

@ -1,3 +0,0 @@
[Service]
# Fix for #21
ExecStartPost=systemctl try-restart naxalnet.service

4
setup.cfg
View File

@ -34,10 +34,6 @@ console_scripts =
[options.data_files] [options.data_files]
lib/systemd/system = lib/systemd/system =
service/naxalnet.service service/naxalnet.service
lib/systemd/system/iwd.service.d =
service/iwd.service.d/naxalnet.conf
lib/systemd/system/wpa_supplicant.service.d =
service/wpa_supplicant.service.d/naxalnet.conf
# If installing with pip, this file will be copied to some other place. # If installing with pip, this file will be copied to some other place.
# This is the reason we use setup.py instead of pip in the Makefile. # This is the reason we use setup.py instead of pip in the Makefile.
/etc/naxalnet = /etc/naxalnet =