From 0bc5d20e8f952918f711eda29fd3744aae721113 Mon Sep 17 00:00:00 2001 From: Michael Kroes Date: Fri, 11 Mar 2016 15:10:31 +0100 Subject: [PATCH 1/2] Add check for user overrides to wgetrc --- setup/preflight.sh | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/setup/preflight.sh b/setup/preflight.sh index e854249e..c83af345 100644 --- a/setup/preflight.sh +++ b/setup/preflight.sh @@ -40,3 +40,9 @@ 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 + +# Check that no .wgetrc exists +if [ -e ~/.wgetrc ]; then + echo "Mail-in-a-Box expects no default overrides to wget" + exit +fi From 33a9fb6aa2a466a3f169617e72a169d32fdc6362 Mon Sep 17 00:00:00 2001 From: Michael Kroes Date: Fri, 11 Mar 2016 15:14:37 +0100 Subject: [PATCH 2/2] Add a better message --- setup/preflight.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup/preflight.sh b/setup/preflight.sh index c83af345..e395ddee 100644 --- a/setup/preflight.sh +++ b/setup/preflight.sh @@ -43,6 +43,6 @@ fi # Check that no .wgetrc exists if [ -e ~/.wgetrc ]; then - echo "Mail-in-a-Box expects no default overrides to wget" + echo "Mail-in-a-Box expects no overrides to wget defaults, ~/.wgetrc exists" exit fi