From d4c0a2420fb03d4ad2925cc13275da63352db105 Mon Sep 17 00:00:00 2001
From: necro-nemesis <necro_nemesis@hotmail.com>
Date: Fri, 18 Oct 2019 12:45:19 -0400
Subject: [PATCH] armbianEnv patch

---
 installers/common.sh   | 12 +++++-------
 installers/raspbian.sh |  8 ++++++++
 2 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/installers/common.sh b/installers/common.sh
index 56dfe7c..196b65c 100755
--- a/installers/common.sh
+++ b/installers/common.sh
@@ -94,6 +94,10 @@ function install_dependencies() {
 function stop_lokinet(){
     sudo systemctl stop lokinet.service
 }
+function common_interfacest(){
+    #OVERLOAD THIS
+    install_error "Not Armbian"
+}
 
 # Replaces NetworkManager with DHCPD
 function check_for_networkmananger() {
@@ -384,12 +388,6 @@ function optimize_php() {
     fi
 }
 
-function build_R1 () {
-  if [ -f /boot/armbianEnv]; then
-    sudo sed -i '1i extraargs=net.ifnames=0' /boot/armbianEnv.txt
-  fi
-}
-
 function install_complete() {
     install_log "Installation completed!"
 
@@ -410,6 +408,7 @@ function install_raspap() {
     config_installation
     update_system_packages
     install_dependencies
+    common_interfaces
     stop_lokinet
     check_for_networkmananger
     optimize_php
@@ -423,6 +422,5 @@ function install_raspap() {
     network_tables
     default_configuration
     patch_system_files
-    build_R1
     install_complete
 }
diff --git a/installers/raspbian.sh b/installers/raspbian.sh
index 83246c9..cac58f6 100755
--- a/installers/raspbian.sh
+++ b/installers/raspbian.sh
@@ -30,4 +30,12 @@ function check_for_networkmananger() {
 
 }
 
+#If Armbian set network interfaces naming convention
+
+function common_interfaces () {
+  if [ -f /boot/armbianEnv]; then
+    sudo sed -i '1i extraargs=net.ifnames=0' /boot/armbianEnv.txt && install_log "armbianEnv patched"
+  fi
+}
+
 install_raspap