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

improve rpi detection

Browse Source
This commit is contained in:
Aaron Murray 2020-09-14 06:37:25 -05:00
parent 48910ac9eb
commit 71dacc10d4
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
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.2.6 # version: 1.2.7
# #
if [[ $(id -u) -ne 0 ]]; then if [[ $(id -u) -ne 0 ]]; then
@ -99,7 +99,6 @@ apt-get --yes --no-install-recommends --reinstall install lsb-release
arch="$(dpkg --print-architecture)" arch="$(dpkg --print-architecture)"
codename="$(lsb_release --codename --short)" codename="$(lsb_release --codename --short)"
distributor="$(lsb_release --id --short)"
case ${codename} in case ${codename} in
stretch) stretch)
@ -130,13 +129,13 @@ tz=$(</etc/timezone)
# Add Debian signing keys to raspbian to prevent apt-get update failures # Add Debian signing keys to raspbian to prevent apt-get update failures
# when OMV adds security and/or backports repos # when OMV adds security and/or backports repos
if [[ "${distributor}" == "Raspbian" ]]; then if grep -q raspberrypi.org /etc/apt/sources.list.d/*; then
echo "Adding Debian signing keys..." echo "Adding Debian signing keys..."
for key in AA8E81B4331F7F50 112695A0E562B32A 04EE7237B7D453EC 648ACFD622F3D138; do for key in AA8E81B4331F7F50 112695A0E562B32A 04EE7237B7D453EC 648ACFD622F3D138; do
apt-key adv --no-tty --keyserver ${keyserver} --recv-keys "${key}" apt-key adv --no-tty --keyserver ${keyserver} --recv-keys "${key}"
done done
echo "Installing monit from raspberrypi repo..." echo "Installing monit from raspberrypi repo..."
apt-get --yes --no-install-recommends install -t buster monit apt-get --yes --no-install-recommends install -t ${codename} monit
fi fi
echo "Install prerequisites..." echo "Install prerequisites..."