diff --git a/setup/preflight.sh b/setup/preflight.sh index a1899e81..e854249e 100644 --- a/setup/preflight.sh +++ b/setup/preflight.sh @@ -34,10 +34,9 @@ if [ ! -d /vagrant ]; then fi fi -# Check that tempfs is not mounted with noexec +# 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 diff --git a/setup/start.sh b/setup/start.sh index ab6d3055..3a93ac22 100755 --- a/setup/start.sh +++ b/setup/start.sh @@ -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