Flag OMV5 as Stable and improve tweak for Helios4 #87

* remove omv5 beta message since OMV5 has been released
* create salt sls file for mdadm.conf PROGRAM entry
* load armbian-release file if present to set $Board
This commit is contained in:
Aaron Murray
2020-03-24 07:18:54 -05:00
committed by Gauthier Provost
parent d6f668fea4
commit 4ed2832ee9

View File

@@ -552,6 +552,9 @@ install_omv (){
#
# Install OpenMediaVault on Debian
#
if [ -f /etc/armbian-release ]; then
. /etc/armbian-release
fi
# Don't allow installation on Ubuntu
if [[ "$family" == "Ubuntu" ]]; then
@@ -567,9 +570,6 @@ case $distribution in
sleep 5
exit 1
;;
buster)
dialog --title "Warning" --msgbox "\nPlease be aware that OMV5 is still in beta state. Report any issues you run into at forum.openmediavault.org.\n\nIf you want to run Stable OMV4 you need to run Debian Stretch." 11 56
;;
esac
# Download OMV install script
@@ -615,7 +615,11 @@ case ${BOARD} in
sed -i -e "/HOMEHOST/a \\\n# Trigger Fault Led script when an event is detected\\nPROGRAM \/usr\/sbin\/mdadm-fault-led.sh" /usr/share/openmediavault/mkconf/mdadm
/usr/sbin/omv-mkconf mdadm
elif [[ "$distribution" == "buster" ]]; then
sed -i -e "/HOMEHOST/a \\\n# Trigger Fault Led script when an event is detected\\nPROGRAM \/usr\/sbin\/mdadm-fault-led.sh" /srv/salt/omv/deploy/mdadm/files/etc-mdadm-mdadm.conf.j2
cat <<EOF > /srv/salt/omv/deploy/mdadm/25faultled.sls
mdadm_add_program_config:
cmd.run:
- name: "echo -e '\n# Trigger Fault Led script when an event is detected\nPROGRAM /usr/sbin/mdadm-fault-led.sh' >> /etc/mdadm/mdadm.conf"
EOF
/usr/sbin/omv-salt deploy run mdadm
fi
fi