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

fix rpi watchdog

Browse Source
This commit is contained in:
Aaron Murray 2022-01-18 15:45:26 -06:00
parent d9a50bb454
commit f561189c61
1 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
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.6.3 # version: 1.6.4
# #
if [[ $(id -u) -ne 0 ]]; then if [[ $(id -u) -ne 0 ]]; then
@ -188,11 +188,6 @@ if grep -rq raspberrypi.org /etc/apt/*; then
# remove vscode repo if found since there is no desktop environment # remove vscode repo if found since there is no desktop environment
# empty file will exist to keep raspberrypi-sys-mods package from adding it back # empty file will exist to keep raspberrypi-sys-mods package from adding it back
truncate -s 0 "${vsCodeList}" truncate -s 0 "${vsCodeList}"
if [ ${version} -eq 6 ]; then
echo "OMV 6.x on Raspberry Pi is temporarily broken. The fix is being worked on."
exit 123
fi
fi fi
echo "Install prerequisites..." echo "Install prerequisites..."
@ -234,7 +229,7 @@ if [[ ! "${omvInstall}" == "ii" ]]; then
echo "Installing openmediavault..." echo "Installing openmediavault..."
aptFlags="--yes --auto-remove --show-upgraded --allow-downgrades --allow-change-held-packages --no-install-recommends" aptFlags="--yes --auto-remove --show-upgraded --allow-downgrades --allow-change-held-packages --no-install-recommends"
cmd="apt-get ${aptFlags} install openmediavault${over}" cmd="apt-get ${aptFlags} install openmediavault"
if ! ${cmd}; then if ! ${cmd}; then
echo "failed to install openmediavault package." echo "failed to install openmediavault package."
exit 2 exit 2
@ -358,8 +353,12 @@ echo "Disabling data collection ..."
# set min/max frequency and watchdog for RPi boards # set min/max frequency and watchdog for RPi boards
rpi_model="/proc/device-tree/model" rpi_model="/proc/device-tree/model"
if [ -f "${rpi_model}" ] && [[ $(awk '{ print $1 }' ${rpi_model}) = "Raspberry" ]]; then if [ -f "${rpi_model}" ] && [[ $(awk '{ print $1 }' ${rpi_model}) = "Raspberry" ]]; then
omv_set_default "OMV_WATCHDOG_DEFAULT_MODULE" "bcm2835_wdt" if [ ${version} -ge 6 ]; then
omv_set_default "OMV_WATCHDOG_CONF_WATCHDOG_TIMEOUT" "14" omv_set_default "OMV_WATCHDOG_SYSTEMD_RUNTIMEWATCHDOGSEC" 14 true
else
omv_set_default "OMV_WATCHDOG_DEFAULT_MODULE" "bcm2835_wdt"
omv_set_default "OMV_WATCHDOG_CONF_WATCHDOG_TIMEOUT" "14"
fi
MIN_SPEED="$(</sys/devices/system/cpu/cpufreq/policy0/cpuinfo_min_freq)" MIN_SPEED="$(</sys/devices/system/cpu/cpufreq/policy0/cpuinfo_min_freq)"
MAX_SPEED="$(</sys/devices/system/cpu/cpufreq/policy0/cpuinfo_max_freq)" MAX_SPEED="$(</sys/devices/system/cpu/cpufreq/policy0/cpuinfo_max_freq)"