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

make apt use ipv4 only by default and add flag to enable ipv6

Browse Source
This commit is contained in:
Aaron Murray 2020-10-15 07:30:19 -05:00
parent 7bfd864a47
commit 2d29604d7b
1 changed files with 24 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
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.8 # version: 1.2.9
# #
if [[ $(id -u) -ne 0 ]]; then if [[ $(id -u) -ne 0 ]]; then
@ -28,17 +28,20 @@ if [ ! "${systemd}" = "systemd" ]; then
fi fi
declare -i cfg=0 declare -i cfg=0
declare -l codename declare -i ipv6=0
declare -l omvCodename
declare -l omvInstall=""
declare -l omvextrasInstall=""
declare -i skipFlash=0 declare -i skipFlash=0
declare -i skipNet=0 declare -i skipNet=0
declare -i version declare -i version
declare -l codename
declare -l omvCodename
declare -l omvInstall=""
declare -l omvextrasInstall=""
cpuFreqDef="/etc/default/cpufrequtils" cpuFreqDef="/etc/default/cpufrequtils"
crda="/etc/default/crda" crda="/etc/default/crda"
defaultGovSearch="^CONFIG_CPU_FREQ_DEFAULT_GOV_" defaultGovSearch="^CONFIG_CPU_FREQ_DEFAULT_GOV_"
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"
@ -58,7 +61,7 @@ if [ -f /etc/armbian-release ]; then
. /etc/armbian-release . /etc/armbian-release
fi fi
while getopts "fhn" opt; do while getopts "fhin" opt; do
echo "option ${opt}" echo "option ${opt}"
case "${opt}" in case "${opt}" in
f) f)
@ -68,6 +71,8 @@ while getopts "fhn" opt; do
echo "Use the following flags:" echo "Use the following flags:"
echo " -f" echo " -f"
echo " to skip the installation of the flashmemory plugin" echo " to skip the installation of the flashmemory plugin"
echo " -i"
echo " enable using IPv6 for apt"
echo " -n" echo " -n"
echo " to skip the network setup" echo " to skip the network setup"
echo "" echo ""
@ -77,6 +82,9 @@ while getopts "fhn" opt; do
echo " install -n" echo " install -n"
exit 100 exit 100
;; ;;
i)
ipv6=1
;;
n) n)
skipNet=1 skipNet=1
;; ;;
@ -91,6 +99,12 @@ echo "Current / permissions = $(stat -c %a /)"
chmod g-w,o-w / chmod g-w,o-w /
echo "New / permissions = $(stat -c %a /)" echo "New / permissions = $(stat -c %a /)"
# if ipv6 is not enabled, create apt config file to force ipv4
if [ ${ipv6} -ne 1 ]; then
echo "Forcing IPv4 only for apt..."
echo 'Acquire::ForceIPv4 "true";' > ${forceIpv4}
fi
echo "Updating repos before installing..." echo "Updating repos before installing..."
apt-get update apt-get update
@ -357,6 +371,10 @@ if [ ! -d "${sessDir}" ]; then
mkdir --parents --mode=1733 ${sessDir} mkdir --parents --mode=1733 ${sessDir}
fi fi
if [ -f "${forceIpv4}" ]; then
rm ${forceIpv4}
fi
if [[ "${arch}" == "amd64" ]] || [[ "${arch}" == "i386" ]]; then if [[ "${arch}" == "amd64" ]] || [[ "${arch}" == "i386" ]]; then
# skip ionice on x86 boards # skip ionice on x86 boards
echo "Done." echo "Done."