external
/
mailinabox
mirror of https://github.com/mail-in-a-box/mailinabox.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Add extra check when adding swap to see if swap would be allocated on next boot. Only activate swap on boot if initial activation succeeded. Refactor if statement for readability. Add comments on all checks performed.

This commit is contained in:
Michael Kroes 2016-03-16 07:16:25 +01:00
parent 41c6c9c72e
commit 1be652b72f
1 changed files with 20 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
setup/system.sh
View File

@ -14,16 +14,27 @@ source setup/functions.sh # load our functions
# and buffers for the system. We will only allocate this file if there is more # and buffers for the system. We will only allocate this file if there is more
# than 5GB of disk space available # than 5GB of disk space available
# The following checks are performed:
# - Check if swap is currently mountend by looking at /proc/mounts
# - Check if the user intents to activate swap on next boot by checking fstab entries.
# - Check if a swapfile already exists
# - Check the memory requirements
# - Check available diskspace
# See https://www.digitalocean.com/community/tutorials/how-to-add-swap-on-ubuntu-14-04 # See https://www.digitalocean.com/community/tutorials/how-to-add-swap-on-ubuntu-14-04
# for reference # for reference
SWAP_MOUNTED=$(grep "swap" /proc/mounts) SWAP_MOUNTED=$(grep "swap" /proc/mounts)
SWAP_IN_FSTAB=$(grep "swap" /etc/fstab)
TOTAL_PHYSICAL_MEM=$(head -n 1 /proc/meminfo | awk '{print $2}') TOTAL_PHYSICAL_MEM=$(head -n 1 /proc/meminfo | awk '{print $2}')
AVAILABLE_DISK_SPACE=$(df / --output=avail | tail -n 1) AVAILABLE_DISK_SPACE=$(df / --output=avail | tail -n 1)
if [ $TOTAL_PHYSICAL_MEM -lt 1900000 ]; then if
if [ -z "$SWAP_MOUNTED" ]; then [ -z "$SWAP_MOUNTED" ] &&
if [ ! -e /swapfile ]; then [ -z "$SWAP_IN_FSTAB" ] &&
if [ $AVAILABLE_DISK_SPACE -gt 5242880 ]; then [ ! -e /swapfile ] &&
[ $TOTAL_PHYSICAL_MEM -lt 1900000 ] &&
[ $AVAILABLE_DISK_SPACE -gt 5242880 ]
then
echo "Adding swap to the system..." echo "Adding swap to the system..."
# Allocate and activate the swap file # Allocate and activate the swap file
@ -32,11 +43,11 @@ if [ $AVAILABLE_DISK_SPACE -gt 5242880 ]; then
hide_output mkswap /swapfile hide_output mkswap /swapfile
swapon /swapfile swapon /swapfile
# Make sure swap is activated on boot # Check if swap is mounted then activate on boot
echo "/swapfile none swap sw 0 0" >> /etc/fstab ACTIVATED_SWAP=$(swapon -s | grep "\/swapfile")
fi if [ -n "$ACTIVATED_SWAP" ]; then
fi echo "/swapfile none swap sw 0 0" >> /etc/fstab
fi fi
fi fi
# ### Add Mail-in-a-Box's PPA. # ### Add Mail-in-a-Box's PPA.