From 19ce68a2a81b57e95d3f6d32536afc79194ea293 Mon Sep 17 00:00:00 2001
From: Aaron Murray <plugins@omv-extras.org>
Date: Wed, 3 Jun 2020 19:38:02 -0500
Subject: [PATCH] remove temporary wifi change

---
 install | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/install b/install
index 03365d1..9a8a3a7 100755
--- a/install
+++ b/install
@@ -13,7 +13,7 @@
 # https://github.com/armbian/config/blob/master/debian-software
 # https://forum.openmediavault.org/index.php/Thread/25062-Install-OMV5-on-Debian-10-Buster/
 #
-# version: 1.1.5
+# version: 1.2.0
 #
 
 if [[ $(id -u) -ne 0 ]]; then
@@ -418,13 +418,6 @@ if [ ${version} -gt 4 ] && [ ${skipNet} -ne 1 ]; then
     ${rfkill} unblock all
   fi
 
-  # temporary change to support OMV 5.5.0
-  if grep -q 'vlan|wireless' ${OMV_CONFIG_FILE}; then
-    wifi="wireless"
-  else
-    wifi="wifi"
-  fi
-
   for nic in $(ls /sys/class/net | grep -vE "br-|docker|dummy|lo|tun|virbr"); do
     if grep -q "<devicename>${nic}</devicename>" ${OMV_CONFIG_FILE}; then
       echo "${nic} already found in database.  Skipping..."
@@ -443,7 +436,7 @@ if [ ${version} -gt 4 ] && [ ${skipNet} -ne 1 ]; then
           fi
           echo "Adding ${nic} to openmedivault database ..."
           jq --null-input --compact-output \
-            "{uuid: \"${OMV_CONFIGOBJECT_NEW_UUID}\", devicename: \"${nic}\", type: \"${wifi}\", method: \"dhcp\", method6: \"dhcp\", wpassid: \"${wifiName}\", wpapsk: \"${wifiPass}\"}" | \
+            "{uuid: \"${OMV_CONFIGOBJECT_NEW_UUID}\", devicename: \"${nic}\", type: \"wifi\", method: \"dhcp\", method6: \"dhcp\", wpassid: \"${wifiName}\", wpapsk: \"${wifiPass}\"}" | \
             omv-confdbadm update "conf.system.network.interface" -
           cfg=1
         fi