From 91f2323c50ad6002af70fa8b7f2cdeefc15a6158 Mon Sep 17 00:00:00 2001
From: "Igor Zalatov (from Citadel PC)" <flyrouter@gmail.com>
Date: Sat, 17 Sep 2022 01:26:29 +0300
Subject: [PATCH] Removing network interfaces to separate files

---
 general/overlay/etc/network/interfaces        | 43 +------------------
 .../overlay/etc/network/interfaces.d/eth0:1   |  5 +++
 general/overlay/etc/network/interfaces.d/eth2 |  8 ++++
 general/overlay/etc/network/interfaces.d/ppp0 | 10 +++++
 general/overlay/etc/network/interfaces.d/usb0 | 11 +++++
 general/overlay/etc/network/interfaces.d/wg0  |  9 ++++
 6 files changed, 44 insertions(+), 42 deletions(-)
 create mode 100644 general/overlay/etc/network/interfaces.d/eth0:1
 create mode 100644 general/overlay/etc/network/interfaces.d/eth2
 create mode 100644 general/overlay/etc/network/interfaces.d/ppp0
 create mode 100644 general/overlay/etc/network/interfaces.d/usb0
 create mode 100644 general/overlay/etc/network/interfaces.d/wg0

diff --git a/general/overlay/etc/network/interfaces b/general/overlay/etc/network/interfaces
index 8982bd1e..e28c543b 100644
--- a/general/overlay/etc/network/interfaces
+++ b/general/overlay/etc/network/interfaces
@@ -1,4 +1,3 @@
-# Interfaces
 
 auto lo
 iface lo inet loopback
@@ -8,11 +7,6 @@ iface eth0 inet dhcp
     hwaddress ether $(fw_printenv -n ethaddr || echo 00:24:B8:FF:FF:FF)
     #pre-up echo -e "nameserver 77.88.8.8\nnameserver 8.8.4.4\n" >/tmp/resolv.conf
 
-manual eth0:1
-iface eth0:1 inet static
-    address $(fw_printenv -n ipaddr || echo 192.168.1.10)
-    netmask 255.255.255.0
-
 manual wlan0
 iface wlan0 inet dhcp
     pre-up devmem 0x100C0080 32 0x530
@@ -27,40 +21,5 @@ iface wlan0 inet dhcp
     post-down echo 1 > /sys/class/gpio/gpio7/value
     post-down echo 7 > /sys/class/gpio/unexport
 
-manual eth2
-iface eth2 inet dhcp
-    pre-up wifi xm711
-    pre-up wpa_passphrase "SSID" "password" >/tmp/wpa_supplicant.conf
-    pre-up sed -i '2i \\tscan_ssid=1' /tmp/wpa_supplicant.conf
-    pre-up (sleep 3; wpa_supplicant -B -D nl80211 -i eth2 -c/tmp/wpa_supplicant.conf)
-    post-down killall -q wpa_supplicant
+source-dir /etc/network/interfaces.d
 
-manual usb0
-iface usb0 inet dhcp
-    pre-up echo 9 > /sys/class/gpio/export
-    pre-up echo out > /sys/class/gpio/gpio9/direction
-    pre-up echo 0 > /sys/class/gpio/gpio9/value
-    pre-up modprobe usbserial vendor=0x2c7c product=0x6026
-    pre-up modprobe rndis_host
-    pre-up sleep 10
-    post-down echo 1 > /sys/class/gpio/gpio9/value
-    post-down echo 9 > /sys/class/gpio/unexport
-
-manual ppp0
-iface ppp0 inet manual
-    pre-up echo 61 > /sys/class/gpio/export
-    pre-up echo out > /sys/class/gpio/gpio61/direction
-    pre-up echo 0 > /sys/class/gpio/gpio61/value
-    pre-up (sleep 7; pon)
-    post-down poff
-    post-down echo 1 > /sys/class/gpio/gpio61/value
-    post-down echo 61 > /sys/class/gpio/unexport
-
-manual wg0
-iface wg0 inet static
-    address 192.168.99.1
-    netmask 255.255.255.0
-    pre-up modprobe wireguard
-    pre-up ip link add dev wg0 type wireguard
-    pre-up wg setconf wg0 /etc/wireguard.conf
-    post-down ip link del dev wg0
diff --git a/general/overlay/etc/network/interfaces.d/eth0:1 b/general/overlay/etc/network/interfaces.d/eth0:1
new file mode 100644
index 00000000..5b077a87
--- /dev/null
+++ b/general/overlay/etc/network/interfaces.d/eth0:1
@@ -0,0 +1,5 @@
+
+manual eth0:1
+iface eth0:1 inet static
+    address $(fw_printenv -n ipaddr || echo 192.168.1.10)
+    netmask 255.255.255.0
diff --git a/general/overlay/etc/network/interfaces.d/eth2 b/general/overlay/etc/network/interfaces.d/eth2
new file mode 100644
index 00000000..19a53541
--- /dev/null
+++ b/general/overlay/etc/network/interfaces.d/eth2
@@ -0,0 +1,8 @@
+
+manual eth2
+iface eth2 inet dhcp
+    pre-up wifi xm711
+    pre-up wpa_passphrase "SSID" "password" >/tmp/wpa_supplicant.conf
+    pre-up sed -i '2i \\tscan_ssid=1' /tmp/wpa_supplicant.conf
+    pre-up (sleep 3; wpa_supplicant -B -D nl80211 -i eth2 -c/tmp/wpa_supplicant.conf)
+    post-down killall -q wpa_supplicant
diff --git a/general/overlay/etc/network/interfaces.d/ppp0 b/general/overlay/etc/network/interfaces.d/ppp0
new file mode 100644
index 00000000..8ca3dc45
--- /dev/null
+++ b/general/overlay/etc/network/interfaces.d/ppp0
@@ -0,0 +1,10 @@
+
+manual ppp0
+iface ppp0 inet manual
+    pre-up echo 61 > /sys/class/gpio/export
+    pre-up echo out > /sys/class/gpio/gpio61/direction
+    pre-up echo 0 > /sys/class/gpio/gpio61/value
+    pre-up (sleep 7; pon)
+    post-down poff
+    post-down echo 1 > /sys/class/gpio/gpio61/value
+    post-down echo 61 > /sys/class/gpio/unexport
diff --git a/general/overlay/etc/network/interfaces.d/usb0 b/general/overlay/etc/network/interfaces.d/usb0
new file mode 100644
index 00000000..b7486141
--- /dev/null
+++ b/general/overlay/etc/network/interfaces.d/usb0
@@ -0,0 +1,11 @@
+
+manual usb0
+iface usb0 inet dhcp
+    pre-up echo 9 > /sys/class/gpio/export
+    pre-up echo out > /sys/class/gpio/gpio9/direction
+    pre-up echo 0 > /sys/class/gpio/gpio9/value
+    pre-up modprobe usbserial vendor=0x2c7c product=0x6026
+    pre-up modprobe rndis_host
+    pre-up sleep 10
+    post-down echo 1 > /sys/class/gpio/gpio9/value
+    post-down echo 9 > /sys/class/gpio/unexport
diff --git a/general/overlay/etc/network/interfaces.d/wg0 b/general/overlay/etc/network/interfaces.d/wg0
new file mode 100644
index 00000000..abb57725
--- /dev/null
+++ b/general/overlay/etc/network/interfaces.d/wg0
@@ -0,0 +1,9 @@
+
+manual wg0
+iface wg0 inet static
+    address 192.168.99.1
+    netmask 255.255.255.0
+    pre-up modprobe wireguard
+    pre-up ip link add dev wg0 type wireguard
+    pre-up wg setconf wg0 /etc/wireguard.conf
+    post-down ip link del dev wg0