diff --git a/README.md b/README.md index 895cfe8..9896470 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ # installScript # install the script's prerequisites -apt-get install wget lsb-release sudo +apt-get install wget sudo # download script and execute wget -O - https://github.com/OpenMediaVault-Plugin-Developers/installScript/raw/master/install | sudo bash diff --git a/install b/install index b36d002..8dd9b67 100755 --- a/install +++ b/install @@ -37,6 +37,11 @@ if [ -f /etc/armbian-release ]; then . /etc/armbian-release fi +if [ ! -f "/usr/bin/lsb_release" ]; then + echo "Installing lsb_release..." + apt-get --yes --no-install-recommends install lsb-release +fi + codename="$(lsb_release --codename --short)" distributor="$(lsb_release --id --short)" @@ -224,6 +229,11 @@ omv_set_default "OMV_CPUFREQUTILS_GOVERNOR" "${GOVERNOR}" omv_set_default "OMV_CPUFREQUTILS_MINSPEED" "${MIN_SPEED}" omv_set_default "OMV_CPUFREQUTILS_MAXSPEED" "${MAX_SPEED}" +if [ ${version} -gt 4 ]; then + # update pillar default list - /srv/pillar/omv/default.sls + omv-salt stage run prepare +fi + # update config files for service in samba flashmemory ssh ${ntp} timezone monit rrdcached collectd cpufrequtils ; do ${confCmd} ${service}