Commit 92c37fc0 authored by ThomasKaiser's avatar ThomasKaiser
Browse files

OMV installation fixes

Tested on Armbian and 'foreign' Jessie and Stretch installations
parent 3101e0f7
...@@ -308,11 +308,11 @@ case $distribution in ...@@ -308,11 +308,11 @@ case $distribution in
;; ;;
esac esac
sed -i "s/^# en_US.UTF-8/en_US.UTF-8/" /etc/locale.gen export APT_LISTCHANGES_FRONTEND=none
locale-gen if [ ! -f /etc/armbian-release ]; then
sed -i "s/^# en_US.UTF-8/en_US.UTF-8/" /etc/locale.gen
wget -qO - https://packages.openmediavault.org/public/archive.key | apt-key add - locale-gen
apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 7AA630A1EDEE7D73 fi
cat > /etc/apt/sources.list.d/openmediavault.list << EOF cat > /etc/apt/sources.list.d/openmediavault.list << EOF
deb https://openmediavault.github.io/packages/ ${OMV_Name} main deb https://openmediavault.github.io/packages/ ${OMV_Name} main
...@@ -325,18 +325,27 @@ deb https://openmediavault.github.io/packages/ ${OMV_Name}-proposed main ...@@ -325,18 +325,27 @@ deb https://openmediavault.github.io/packages/ ${OMV_Name}-proposed main
# deb https://openmediavault.github.io/packages/ ${OMV_Name} partner # deb https://openmediavault.github.io/packages/ ${OMV_Name} partner
EOF EOF
debconf-apt-progress -- apt-get update
apt-get --allow-unauthenticated install openmediavault-keyring
apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 7AA630A1EDEE7D73
read HOSTNAME </etc/hostname read HOSTNAME </etc/hostname
read TZ </etc/timezone read TZ </etc/timezone
debconf-apt-progress -- apt-get update
debconf-set-selections <<< "postfix postfix/mailname string ${HOSTNAME}" debconf-set-selections <<< "postfix postfix/mailname string ${HOSTNAME}"
debconf-apt-progress -- apt-get -y --allow-unauthenticated --fix-missing --no-install-recommends install openmediavault postfix SPACE_NEEDED=$(apt-get --assume-no --fix-missing --no-install-recommends install openmediavault postfix 2>/dev/null | awk -F" " '/additional disk space will be used/ {print $4}')
SPACE_AVAIL=$(df -k / | awk -F" " '/\/$/ {printf ("%0.0f",$4/1200); }')
if [ ${SPACE_AVAIL} -lt ${SPACE_NEEDED} ]; then
dialog --backtitle "$backtitle" --title "No space left on device" --msgbox "\nOpenMediaVault needs ${SPACE_NEEDED} MB for installation while only ${SPACE_AVAIL} MB are available." 7 52
exit 1
fi
apt-get -y --fix-missing --no-install-recommends install openmediavault postfix
FILE=`mktemp`; wget "$OMV_EXTRAS_URL" -qO $FILE && dpkg -i $FILE; rm $FILE FILE=`mktemp`; wget "$OMV_EXTRAS_URL" -qO $FILE && dpkg -i $FILE; rm $FILE
/usr/sbin/omv-update /usr/sbin/omv-update
# Install flashmemory plugin and netatalk by default, use nice logo for the latter, # Install flashmemory plugin and netatalk by default, use nice logo for the latter,
# disable OMV monitoring by default # disable OMV monitoring by default
. /usr/share/openmediavault/scripts/helper-functions . /usr/share/openmediavault/scripts/helper-functions
apt-get -y -q --allow-unauthenticated install openmediavault-flashmemory openmediavault-netatalk apt-get -y --fix-missing --no-install-recommends --auto-remove install openmediavault-flashmemory openmediavault-netatalk
AFP_Options="mimic model = Macmini" AFP_Options="mimic model = Macmini"
SMB_Options="min receivefile size = 16384\nwrite cache size = 524288\ngetwd cache = yes\nsocket options = TCP_NODELAY IPTOS_LOWDELAY" SMB_Options="min receivefile size = 16384\nwrite cache size = 524288\ngetwd cache = yes\nsocket options = TCP_NODELAY IPTOS_LOWDELAY"
xmlstarlet ed -L -u "/config/services/afp/extraoptions" -v "$(echo -e "${AFP_Options}")" ${OMV_CONFIG_FILE} xmlstarlet ed -L -u "/config/services/afp/extraoptions" -v "$(echo -e "${AFP_Options}")" ${OMV_CONFIG_FILE}
...@@ -353,15 +362,25 @@ sed -i 's|-j /var/lib/rrdcached/journal/ ||' /etc/init.d/rrdcached ...@@ -353,15 +362,25 @@ sed -i 's|-j /var/lib/rrdcached/journal/ ||' /etc/init.d/rrdcached
for i in netatalk samba flashmemory ssh ntp timezone monit rrdcached collectd ; do for i in netatalk samba flashmemory ssh ntp timezone monit rrdcached collectd ; do
/usr/sbin/omv-mkconf $i /usr/sbin/omv-mkconf $i
done done
/sbin/folder2ram -enablesystemd # /sbin/folder2ram -enablesystemd
# Prevent accidentally destroying board performance by clicking around in OMV UI # Prevent accidentally destroying board performance by clicking around in OMV UI since
# OMV sets 'powersave' governor when touching 'Power Management' settings.
if [ -f /etc/default/cpufrequtils ]; then if [ -f /etc/default/cpufrequtils ]; then
. /etc/default/cpufrequtils . /etc/default/cpufrequtils
echo -e "OMV_CPUFREQUTILS_GOVERNOR=${GOVERNOR}" >>/etc/default/openmediavault else
echo -e "OMV_CPUFREQUTILS_MINSPEED=${MIN_SPEED}" >>/etc/default/openmediavault DEFAULT_GOV="$(zgrep "^CONFIG_CPU_FREQ_DEFAULT_GOV_" /proc/config.gz 2>/dev/null | sed 's/CONFIG_CPU_FREQ_DEFAULT_GOV_//')"
echo -e "OMV_CPUFREQUTILS_MAXSPEED=${MAX_SPEED}" >>/etc/default/openmediavault if [ -n "${DEFAULT_GOV}" ]; then
GOVERNOR=$(cut -f1 -d= <<<"${DEFAULT_GOV}" | tr '[:upper:]' '[:lower:]')
else
GOVERNOR=ondemand
fi
MIN_SPEED="0"
MAX_SPEED="0"
fi fi
echo -e "OMV_CPUFREQUTILS_GOVERNOR=${GOVERNOR}" >>/etc/default/openmediavault
echo -e "OMV_CPUFREQUTILS_MINSPEED=${MIN_SPEED}" >>/etc/default/openmediavault
echo -e "OMV_CPUFREQUTILS_MAXSPEED=${MAX_SPEED}" >>/etc/default/openmediavault
/usr/sbin/omv-initsystem /usr/sbin/omv-initsystem
check_port 80 check_port 80
...@@ -890,9 +909,11 @@ fi ...@@ -890,9 +909,11 @@ fi
# Install basic stuff # Install basic stuff
# #
echo "First start. Checking dependencies. This might take a while." export LANG=C
echo -e "\nChecking dependencies. This might take a while."
apt-get -qq -y --no-install-recommends install debconf-utils unzip build-essential html2text apt-transport-https dialog whiptail \ apt-get -qq -y --no-install-recommends install debconf-utils unzip build-essential html2text apt-transport-https dialog whiptail \
lsb-release bc expect html2text > /dev/null lsb-release bc expect html2text > /dev/null
export DEBIAN_FRONTEND=noninteractive
# gather some info # gather some info
# #
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment