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

add support for mirror repo

Browse Source
This commit is contained in:
Aaron Murray 2023-11-12 11:12:08 -06:00
parent 6a4b6130a4
commit 2d72e46b54
1 changed files with 30 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
install
View File

@ -15,7 +15,7 @@
# #
logfile="omv_install.log" logfile="omv_install.log"
version="2.1.0" version="2.2.0"
_log() _log()
@ -74,6 +74,7 @@ declare -i rpi=0
declare -i skipFlash=0 declare -i skipFlash=0
declare -i skipNet=0 declare -i skipNet=0
declare -i skipReboot=0 declare -i skipReboot=0
declare -i useMirror=0
declare -i version declare -i version
declare -l codename declare -l codename
@ -94,8 +95,10 @@ forceIpv4="/etc/apt/apt.conf.d/99force-ipv4"
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" keyserver="hkp://keyserver.ubuntu.com:80"
mirror="https://mirrors.tuna.tsinghua.edu.cn"
omvKey="/etc/apt/trusted.gpg.d/openmediavault-archive-keyring.gpg" omvKey="/etc/apt/trusted.gpg.d/openmediavault-archive-keyring.gpg"
omvRepo="http://packages.openmediavault.org/public" omvRepo="http://packages.openmediavault.org/public"
omvKeyUrl="${omvRepo}/archive.key"
omvSources="/etc/apt/sources.list.d/openmediavault.list" omvSources="/etc/apt/sources.list.d/openmediavault.list"
resolvTmp="/root/resolv.conf" resolvTmp="/root/resolv.conf"
rfkill="/usr/sbin/rfkill" rfkill="/usr/sbin/rfkill"
@ -116,7 +119,7 @@ if [ -f /etc/armbian-release ]; then
_log "Armbian" _log "Armbian"
fi fi
while getopts "bfhinr" opt; do while getopts "bfhimnr" opt; do
_log "option ${opt}" _log "option ${opt}"
case "${opt}" in case "${opt}" in
b) b)
@ -131,6 +134,8 @@ while getopts "bfhinr" opt; do
echo " to skip the installation of the flashmemory plugin" echo " to skip the installation of the flashmemory plugin"
echo " -i" echo " -i"
echo " enable using IPv6 for apt" echo " enable using IPv6 for apt"
echo " -m"
echo " to repo mirror from ${mirror}"
echo " -n" echo " -n"
echo " to skip the network setup" echo " to skip the network setup"
echo " -r" echo " -r"
@ -151,6 +156,10 @@ while getopts "bfhinr" opt; do
i) i)
ipv6=1 ipv6=1
;; ;;
m)
useMirror=1
omvRepo="${mirror}/OpenMediaVault/public"
;;
n) n)
skipNet=1 skipNet=1
;; ;;
@ -314,7 +323,7 @@ if [[ ! "${omvInstall}" == "ii" ]]; then
_log "Adding openmediavault repo and key..." _log "Adding openmediavault repo and key..."
echo "deb ${omvRepo} ${omvCodename} main" | tee ${omvSources} echo "deb ${omvRepo} ${omvCodename} main" | tee ${omvSources}
wget --quiet --output-document=- "${omvRepo}/archive.key" | gpg --dearmor > "${omvKey}" wget --quiet --output-document=- "${omvKeyUrl}" | gpg --dearmor > "${omvKey}"
_log "Updating repos..." _log "Updating repos..."
apt-get update 2>&1 | tee -a ${logfile} apt-get update 2>&1 | tee -a ${logfile}
@ -380,6 +389,24 @@ if [ ${rpi} -eq 1 ]; then
omv_set_default "OMV_APT_USE_KERNEL_BACKPORTS" false true omv_set_default "OMV_APT_USE_KERNEL_BACKPORTS" false true
fi fi
# change repos if useMirror is specified
if [ ${useMirror} -eq 1 ]; then
_log "Changing repos to mirror from ${mirror} ..."
omv_set_default OMV_APT_REPOSITORY_URL "${mirror}/OpenMediaVault/public" true
omv_set_default OMV_APT_ALT_REPOSITORY_URL "${mirror}/OpenMediaVault/packages" true
omv_set_default OMV_APT_KERNEL_BACKPORTS_REPOSITORY_URL "${mirror}/debian" true
omv_set_default OMV_APT_SECURITY_REPOSITORY_URL "${mirror}/debian-security" true
omv_set_default OMV_EXTRAS_APT_REPOSITORY_URL "${mirror}/OpenMediaVault/openmediavault-plugin-developers" true
omv_set_default OMV_DOCKER_APT_REPOSITORY_URL "${mirror}/docker-ce/linux/debian" true
omv_set_default OMV_PROXMOX_APT_REPOSITORY_URL "${mirror}/proxmox/debian" true
# update pillar default list - /srv/pillar/omv/default.sls
omv-salt stage run prepare 2>&1 | tee -a ${logfile}
# update config files
${confCmd} apt 2>&1 | tee -a ${logfile}
fi
# install omv-extras # install omv-extras
_log "Downloading omv-extras.org plugin for openmediavault ${version}.x ..." _log "Downloading omv-extras.org plugin for openmediavault ${version}.x ..."
file="openmediavault-omvextrasorg_latest_all${version}.deb" file="openmediavault-omvextrasorg_latest_all${version}.deb"