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

add debian signing keys on raspbian installs

Browse Source
This commit is contained in:
Aaron Murray 2019-10-02 13:11:41 -05:00
parent bf31b5236d
commit f781d51b09
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
install
View File

@ -22,6 +22,7 @@ cpuFreqDef="/etc/default/cpufrequtils"
defaultGovSearch="^CONFIG_CPU_FREQ_DEFAULT_GOV_" defaultGovSearch="^CONFIG_CPU_FREQ_DEFAULT_GOV_"
ioniceCron="/etc/cron.d/make_nas_processes_faster" ioniceCron="/etc/cron.d/make_nas_processes_faster"
ioniceScript="/usr/sbin/omv-ionice" ioniceScript="/usr/sbin/omv-ionice"
keyserver="hkp://keyserver.ubuntu.com:80"
omvKey="/etc/apt/trusted.gpg.d/openmediavault-archive-keyring.asc" omvKey="/etc/apt/trusted.gpg.d/openmediavault-archive-keyring.asc"
omvRepo="http://packages.openmediavault.org/public" omvRepo="http://packages.openmediavault.org/public"
omvSources="/etc/apt/sources.list.d/openmediavault.list" omvSources="/etc/apt/sources.list.d/openmediavault.list"
@ -37,6 +38,7 @@ if [ -f /etc/armbian-release ]; then
fi fi
codename="$(lsb_release --codename --short)" codename="$(lsb_release --codename --short)"
distributor="$(lsb_release --id --short)"
case ${codename} in case ${codename} in
stretch) stretch)
@ -61,6 +63,15 @@ echo "${omvCodename} :: ${version}"
hostname=$(</etc/hostname) hostname=$(</etc/hostname)
tz=$(</etc/timezone) tz=$(</etc/timezone)
# Add Debian signing keys to raspbian to prevent apt-get update failures
# when OMV adds security and/or backports repos
if [[ "${distributor}" == "Raspbian" ]]; then
echo "Adding Debian signing keys..."
for key in AA8E81B4331F7F50 112695A0E562B32A; do
apt-key adv --no-tty --keyserver ${keyserver} --recv-keys "${key}"
done
fi
echo "Install prerequisites..." echo "Install prerequisites..."
apt-get --yes --no-install-recommends install dirmngr gnupg apt-get --yes --no-install-recommends install dirmngr gnupg
@ -177,7 +188,7 @@ xmlstarlet ed -L -u "/config/system/network/dns/hostname" -v "${hostname}" ${OMV
/usr/sbin/omv-rpc -u admin "config" "applyChanges" '{ "modules": ["monit","rrdcached","collectd"],"force": true }' /usr/sbin/omv-rpc -u admin "config" "applyChanges" '{ "modules": ["monit","rrdcached","collectd"],"force": true }'
# set min and max frequency for RPi boards # set min and max frequency for RPi boards
if [[ "$(lsb_release --id --short)" == "Raspbian" ]]; then if [[ "${distributor}" == "Raspbian" ]]; then
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)"
# Determine if RPi4 (for future use) # Determine if RPi4 (for future use)