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

remove message that isn't always accurate

Browse Source
This commit is contained in:
Aaron Murray 2021-02-24 19:25:34 -06:00
parent d2204c7290
commit 232e84c8dc
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
install
View File

@ -486,7 +486,6 @@ if [ ${version} -gt 4 ] && [ ${skipNet} -ne 1 ]; then
echo "${nic} already found in database. Skipping..." echo "${nic} already found in database. Skipping..."
continue continue
fi fi
nettype="dhcp"
if udevadm info /sys/class/net/${nic} | grep -q wlan; then if udevadm info /sys/class/net/${nic} | grep -q wlan; then
if [ -f "${wpaConf}" ]; then if [ -f "${wpaConf}" ]; then
country=$(awk -F'=' '/country=/{gsub(/["\r]/,""); print $NF}' ${wpaConf}) country=$(awk -F'=' '/country=/{gsub(/["\r]/,""); print $NF}' ${wpaConf})
@ -518,7 +517,6 @@ if [ ${version} -gt 4 ] && [ ${skipNet} -ne 1 ]; then
jq --null-input --compact-output \ jq --null-input --compact-output \
"{uuid: \"${OMV_CONFIGOBJECT_NEW_UUID}\", devicename: \"${nic}\", method: \"static\", address: \"${ipv4Addr}\", netmask: \"${ipv4Netmask}\", gateway: \"${ipv4GW}\", dnsnameservers: \"8.8.8.8 ${ipv4GW}\"}" | \ "{uuid: \"${OMV_CONFIGOBJECT_NEW_UUID}\", devicename: \"${nic}\", method: \"static\", address: \"${ipv4Addr}\", netmask: \"${ipv4Netmask}\", gateway: \"${ipv4GW}\", dnsnameservers: \"8.8.8.8 ${ipv4GW}\"}" | \
omv-confdbadm update "conf.system.network.interface" - omv-confdbadm update "conf.system.network.interface" -
nettype="static"
else else
jq --null-input --compact-output \ jq --null-input --compact-output \
"{uuid: \"${OMV_CONFIGOBJECT_NEW_UUID}\", devicename: \"${nic}\", method: \"dhcp\", method6: \"dhcp\"}" | \ "{uuid: \"${OMV_CONFIGOBJECT_NEW_UUID}\", devicename: \"${nic}\", method: \"dhcp\", method6: \"dhcp\"}" | \
@ -538,7 +536,7 @@ if [ ${version} -gt 4 ] && [ ${skipNet} -ne 1 ]; then
${confCmd} ${network} ${confCmd} ${network}
if [ ${skipReboot} -ne 1 ]; then if [ ${skipReboot} -ne 1 ]; then
echo "Network setup for ${nettype}. Rebooting..." echo "Network setup. Rebooting..."
reboot reboot
fi fi
else else