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

skip setting network adapters if they are already in database.

Browse Source
This commit is contained in:
Aaron Murray 2020-05-16 09:16:39 -05:00
parent c017cec833
commit 66cab5b6e1
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
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.0 # version: 1.1.1
# #
if [[ $(id -u) -ne 0 ]]; then if [[ $(id -u) -ne 0 ]]; then
@ -409,7 +409,9 @@ if [ ${version} -gt 4 ]; then
ln -s /run/systemd/resolve/resolv.conf /etc/resolv.conf ln -s /run/systemd/resolve/resolv.conf /etc/resolv.conf
nic="eth0" nic="eth0"
if grep -qw "${nic}" /proc/net/dev; then if grep -q "<devicename>${nic}</devicename>" ${OMV_CONFIG_FILE}; then
echo "${nic} already found in database. Skipping..."
elif grep -qw "${nic}" /proc/net/dev; then
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}\", method: \"dhcp\", method6: \"dhcp\"}" | \ "{uuid: \"${OMV_CONFIGOBJECT_NEW_UUID}\", devicename: \"${nic}\", method: \"dhcp\", method6: \"dhcp\"}" | \
@ -423,7 +425,9 @@ if [ ${version} -gt 4 ]; then
fi fi
nic="wlan0" nic="wlan0"
if grep -qw "${nic}" /proc/net/dev; then if grep -q "<devicename>${nic}</devicename>" ${OMV_CONFIG_FILE}; then
echo "${nic} already found in database. Skipping..."
elif grep -qw "${nic}" /proc/net/dev; then
wpaConf="/etc/wpa_supplicant/wpa_supplicant.conf" wpaConf="/etc/wpa_supplicant/wpa_supplicant.conf"
crda="/etc/default/crda" crda="/etc/default/crda"