Merge pull request #728 from yodax/noexec

Add check to preflight for exec on tmp
This commit is contained in:
Joshua Tauberer 2016-02-28 12:38:43 -05:00
commit fc5c198646
2 changed files with 9 additions and 1 deletions

View file

@ -33,3 +33,10 @@ if [ ! -d /vagrant ]; then
exit
fi
fi
# Check that tempfs is mounted with exec
MOUNTED_TMP_AS_NO_EXEC=$(grep "/tmp.*noexec" /proc/mounts)
if [ -n "$MOUNTED_TMP_AS_NO_EXEC" ]; then
echo "Mail-in-a-Box has to have exec rights on /tmp, please mount /tmp with exec"
exit
fi

View file

@ -5,7 +5,8 @@
source setup/functions.sh # load our functions
# Check system setup: Are we running as root on Ubuntu 14.04 on a
# machine with enough memory? If not, this shows an error and exits.
# machine with enough memory? Is /tmp mounted with exec.
# If not, this shows an error and exits.
source setup/preflight.sh
# Ensure Python reads/writes files in UTF-8. If the machine