minor tweaks

This commit is contained in:
Aaron Murray 2020-05-04 08:57:32 -05:00
parent 6a443c404c
commit 7b46a31247

View File

@ -1,6 +1,6 @@
#!/bin/bash #!/bin/bash
# #
# shellcheck disable=SC1090,SC1091,SC1117,SC2016,SC2046,SC2086 # shellcheck disable=SC1090,SC1091,SC1117,SC2016,SC2046,SC2086,SC2174
# #
# Copyright (c) 2015-2020 OpenMediaVault Plugin Developers # Copyright (c) 2015-2020 OpenMediaVault Plugin Developers
# Copyright (c) 2017-2020 Armbian Developers # Copyright (c) 2017-2020 Armbian Developers
@ -93,6 +93,7 @@ distributor="$(lsb_release --id --short)"
case ${codename} in case ${codename} in
stretch) stretch)
confCmd="omv-mkconf" confCmd="omv-mkconf"
network="interfaces"
ntp="ntp" ntp="ntp"
omvCodename="arrakis" omvCodename="arrakis"
phpfpm="php-fpm" phpfpm="php-fpm"
@ -100,6 +101,7 @@ case ${codename} in
;; ;;
buster|eoan) buster|eoan)
confCmd="omv-salt deploy run" confCmd="omv-salt deploy run"
network="systemd-networkd"
ntp="chrony" ntp="chrony"
omvCodename="usul" omvCodename="usul"
phpfpm="phpfpm" phpfpm="phpfpm"
@ -411,11 +413,7 @@ if [ ${version} -gt 4 ]; then
omv-confdbadm update "conf.system.network.interface" - omv-confdbadm update "conf.system.network.interface" -
# create config files # create config files
if [ ${version} -gt 4 ]; then ${confCmd} ${network}
${confCmd} systemd-networkd
else
${confCmd} interfaces
fi
echo "It is recommended to reboot and then setup the network adapter in the openmediavault web interface." echo "It is recommended to reboot and then setup the network adapter in the openmediavault web interface."
fi fi