Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
adam.huang
Config
Commits
8f686e15
Unverified
Commit
8f686e15
authored
Dec 21, 2017
by
Thomas Kaiser
Committed by
GitHub
Dec 21, 2017
Browse files
Properly stop/remove log2ram, take care of other apt processes
parent
9c82fb27
Changes
1
Hide whitespace changes
Inline
Side-by-side
softy
View file @
8f686e15
...
@@ -318,7 +318,7 @@ install_omv (){
...
@@ -318,7 +318,7 @@ install_omv (){
#------------------------------------------------------------------------------------------------------------------------------------------
#------------------------------------------------------------------------------------------------------------------------------------------
# On Debian install OpenMediaVault 3 (Jessie) or 4 (Stretch)
# On Debian install OpenMediaVault 3 (Jessie) or 4 (Stretch)
#------------------------------------------------------------------------------------------------------------------------------------------
#------------------------------------------------------------------------------------------------------------------------------------------
# TODO: Some OMV packages lack authentication
, flashmemory-plugin currently doesn't work as expected
# TODO: Some OMV packages lack authentication
if [[ "$family" == "Ubuntu" ]]; then
if [[ "$family" == "Ubuntu" ]]; then
dialog --backtitle "$backtitle" --title "Dependencies not met" --msgbox "\nOpenMediaVault can only be installed on Debian." 7 52
dialog --backtitle "$backtitle" --title "Dependencies not met" --msgbox "\nOpenMediaVault can only be installed on Debian." 7 52
...
@@ -337,6 +337,7 @@ case $distribution in
...
@@ -337,6 +337,7 @@ case $distribution in
;;
;;
esac
esac
systemctl status log2ram >/dev/null 2>
&
1
&&
(systemctl stop log2ram ; systemctl disable log2ram ; rm /etc/cron.daily/log2ram)
export APT_LISTCHANGES_FRONTEND=none
export APT_LISTCHANGES_FRONTEND=none
if [ -f /etc/armbian-release ]; then
if [ -f /etc/armbian-release ]; then
. /etc/armbian-release
. /etc/armbian-release
...
@@ -400,7 +401,6 @@ xmlstarlet ed -L -u "/config/system/network/dns/hostname" -v "${HOSTNAME}" ${OMV
...
@@ -400,7 +401,6 @@ xmlstarlet ed -L -u "/config/system/network/dns/hostname" -v "${HOSTNAME}" ${OMV
/usr/sbin/omv-rpc -u admin "perfstats" "set" '{"enable":false}'
/usr/sbin/omv-rpc -u admin "perfstats" "set" '{"enable":false}'
/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 }'
sed -i 's|-j /var/lib/rrdcached/journal/ ||' /etc/init.d/rrdcached
sed -i 's|-j /var/lib/rrdcached/journal/ ||' /etc/init.d/rrdcached
systemctl status log2ram >/dev/null 2>
&
1
&&
(systemctl disable log2ram ; rm /etc/cron.daily/log2ram)
/sbin/folder2ram -enablesystemd 2>/dev/null
/sbin/folder2ram -enablesystemd 2>/dev/null
# Prevent accidentally destroying board performance by clicking around in OMV UI since
# Prevent accidentally destroying board performance by clicking around in OMV UI since
...
@@ -1072,8 +1072,23 @@ TEMP_DIR=$(mktemp -d || exit 1)
...
@@ -1072,8 +1072,23 @@ TEMP_DIR=$(mktemp -d || exit 1)
chmod 700 ${TEMP_DIR}
chmod 700 ${TEMP_DIR}
trap "rm -rf \"${TEMP_DIR}\" ; exit 0" 0 1 2 3 15
trap "rm -rf \"${TEMP_DIR}\" ; exit 0" 0 1 2 3 15
# Install basic stuff
# Install basic stuff, we have to wait for other apt tasks to finish
#
# (eg unattended-upgrades)
i=0
tput sc
while fuser /var/lib/dpkg/lock >/dev/null 2>
&
1 ; do
case $(($i % 4)) in
0 ) j="-" ;;
1 ) j="\\" ;;
2 ) j="|" ;;
3 ) j="/" ;;
esac
tput rc
echo -en "\r[$j] Waiting for other software managers to finish..."
sleep 0.5
((i=i+1))
done
echo -e "\nChecking dependencies. This might take a while."
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
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment