OpenSource/OpenMediaVault_installScript
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add temporary fix to support OMV 5.5.0 when released

Browse Source
This commit is contained in:
Aaron Murray 2020-05-21 05:46:55 -05:00
parent ef0cb55fdb
commit 7d694907b7
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
install
View File

@ -13,7 +13,7 @@
# https://github.com/armbian/config/blob/master/debian-software # https://github.com/armbian/config/blob/master/debian-software
# https://forum.openmediavault.org/index.php/Thread/25062-Install-OMV5-on-Debian-10-Buster/ # https://forum.openmediavault.org/index.php/Thread/25062-Install-OMV5-on-Debian-10-Buster/
# #
# version: 1.1.1 # version: 1.1.2
# #
if [[ $(id -u) -ne 0 ]]; then if [[ $(id -u) -ne 0 ]]; then
@ -408,6 +408,13 @@ if [ ${version} -gt 4 ]; then
${rfkill} unblock all ${rfkill} unblock all
fi 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 -v lo); do for nic in $(ls /sys/class/net | grep -v lo); do
if grep -q "<devicename>${nic}</devicename>" ${OMV_CONFIG_FILE}; then if grep -q "<devicename>${nic}</devicename>" ${OMV_CONFIG_FILE}; then
echo "${nic} already found in database. Skipping..." echo "${nic} already found in database. Skipping..."
@ -426,7 +433,7 @@ if [ ${version} -gt 4 ]; then
fi fi
echo "Adding ${nic} to openmedivault database ..." echo "Adding ${nic} to openmedivault database ..."
jq --null-input --compact-output \ jq --null-input --compact-output \
"{uuid: \"${OMV_CONFIGOBJECT_NEW_UUID}\", devicename: \"${nic}\", type: \"wireless\", 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" - omv-confdbadm update "conf.system.network.interface" -
cfg=1 cfg=1
fi fi