From e4a7fa5d3f6ded7817d076029624848aed4c550e Mon Sep 17 00:00:00 2001
From: Pranav Jerry <libreinator@disroot.org>
Date: Sat, 4 Sep 2021 12:59:26 +0530
Subject: [PATCH] renamed systemd-networkd config files

---
 naxalnet.service                                  |  4 ++--
 naxalnet/__init__.py                              |  2 +-
 setup.cfg                                         | 15 ++++++++-------
 .../{01-batman.netdev => mesh.01-batman.netdev}   |  0
 .../{02-bridge.netdev => mesh.02-bridge.netdev}   |  0
 ...oc.network => mesh.03-wireless-ad-hoc.network} |  0
 .../{04-batman.network => mesh.04-batman.network} |  0
 ...ess-ap.network => mesh.05-wireless-ap.network} |  0
 .../{06-eth.network => mesh.06-eth.network}       |  0
 .../{07-bridge.network => mesh.07-bridge.network} |  0
 10 files changed, 11 insertions(+), 10 deletions(-)
 rename systemd-networkd/{01-batman.netdev => mesh.01-batman.netdev} (100%)
 rename systemd-networkd/{02-bridge.netdev => mesh.02-bridge.netdev} (100%)
 rename systemd-networkd/{03-wireless-ad-hoc.network => mesh.03-wireless-ad-hoc.network} (100%)
 rename systemd-networkd/{04-batman.network => mesh.04-batman.network} (100%)
 rename systemd-networkd/{05-wireless-ap.network => mesh.05-wireless-ap.network} (100%)
 rename systemd-networkd/{06-eth.network => mesh.06-eth.network} (100%)
 rename systemd-networkd/{07-bridge.network => mesh.07-bridge.network} (100%)

diff --git a/naxalnet.service b/naxalnet.service
index d3ba53d..4280cfd 100644
--- a/naxalnet.service
+++ b/naxalnet.service
@@ -30,8 +30,8 @@ ExecStartPre=/usr/bin/sleep 2
 ExecStart=/usr/bin/naxalnet
 # Reload systemd-networkd after naxalnet exits
 ExecStartPost=/usr/bin/networkctl reload
-# Delete all files in /run/systemd/network
-ExecStop=/usr/bin/find /run/systemd/network -type f -delete
+# Delete all files starting with mesh.* in /run/systemd/network
+ExecStop=/usr/bin/find /run/systemd/network -type f -delete -name "mesh.*"
 # Delete the interfaces created...
 ExecStopPost=/usr/bin/networkctl delete bridge0 bat0
 # ... and reload the configuration files.
diff --git a/naxalnet/__init__.py b/naxalnet/__init__.py
index c2e97a2..cc4b311 100644
--- a/naxalnet/__init__.py
+++ b/naxalnet/__init__.py
@@ -36,4 +36,4 @@ See README.md for documentation.
 #
 # In case you forgot to change the version, skip the number
 # and put the next number in the next commit.
-__version__ = "0.3.0a1.dev1"
+__version__ = "0.3.0a1.dev3"
diff --git a/setup.cfg b/setup.cfg
index badf0bc..df3c1e4 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -19,6 +19,7 @@ packages = find:
 python_requires = >=3.6
 install_requires =
     dasbus
+    # pathlib, configparser and argparse are in the standard library
     configparser
     pathlib
     argparse
@@ -34,10 +35,10 @@ lib/systemd/system =
 /etc/naxalnet =
     naxalnet.conf.example
 share/naxalnet/networkd =
-    systemd-networkd/01-batman.netdev
-    systemd-networkd/02-bridge.netdev
-    systemd-networkd/03-wireless-ad-hoc.network
-    systemd-networkd/04-batman.network
-    systemd-networkd/05-wireless-ap.network
-    systemd-networkd/06-eth.network
-    systemd-networkd/07-bridge.network
+    systemd-networkd/mesh.01-batman.netdev
+    systemd-networkd/mesh.02-bridge.netdev
+    systemd-networkd/mesh.03-wireless-ad-hoc.network
+    systemd-networkd/mesh.04-batman.network
+    systemd-networkd/mesh.05-wireless-ap.network
+    systemd-networkd/mesh.06-eth.network
+    systemd-networkd/mesh.07-bridge.network
diff --git a/systemd-networkd/01-batman.netdev b/systemd-networkd/mesh.01-batman.netdev
similarity index 100%
rename from systemd-networkd/01-batman.netdev
rename to systemd-networkd/mesh.01-batman.netdev
diff --git a/systemd-networkd/02-bridge.netdev b/systemd-networkd/mesh.02-bridge.netdev
similarity index 100%
rename from systemd-networkd/02-bridge.netdev
rename to systemd-networkd/mesh.02-bridge.netdev
diff --git a/systemd-networkd/03-wireless-ad-hoc.network b/systemd-networkd/mesh.03-wireless-ad-hoc.network
similarity index 100%
rename from systemd-networkd/03-wireless-ad-hoc.network
rename to systemd-networkd/mesh.03-wireless-ad-hoc.network
diff --git a/systemd-networkd/04-batman.network b/systemd-networkd/mesh.04-batman.network
similarity index 100%
rename from systemd-networkd/04-batman.network
rename to systemd-networkd/mesh.04-batman.network
diff --git a/systemd-networkd/05-wireless-ap.network b/systemd-networkd/mesh.05-wireless-ap.network
similarity index 100%
rename from systemd-networkd/05-wireless-ap.network
rename to systemd-networkd/mesh.05-wireless-ap.network
diff --git a/systemd-networkd/06-eth.network b/systemd-networkd/mesh.06-eth.network
similarity index 100%
rename from systemd-networkd/06-eth.network
rename to systemd-networkd/mesh.06-eth.network
diff --git a/systemd-networkd/07-bridge.network b/systemd-networkd/mesh.07-bridge.network
similarity index 100%
rename from systemd-networkd/07-bridge.network
rename to systemd-networkd/mesh.07-bridge.network