X-Git-Url: https://iankelling.org/git/?a=blobdiff_plain;f=filesystem%2Fetc%2Fapt%2Fdetect-http-proxy;h=1cfdaf978b878dd6f76aa2e94c371a8fcfb902db;hb=aeab0a50f945bb27603011de850d870126028444;hp=a6d1d6fb77fa00b08ca1a7286fa40fcb9e9f4253;hpb=0dca9bf18f1d23a66b1f2a634cdebf983919427e;p=distro-setup

diff --git a/filesystem/etc/apt/detect-http-proxy b/filesystem/etc/apt/detect-http-proxy
index a6d1d6f..1cfdaf9 100755
--- a/filesystem/etc/apt/detect-http-proxy
+++ b/filesystem/etc/apt/detect-http-proxy
@@ -11,6 +11,10 @@ proxy_host=faiserver
 proxy_port=3142
 proxy_url=http://$proxy_host:$proxy_port/
 f=/tmp/apt_proxy_fail
+if [[ ! -w /tmp ]]; then
+    echo DIRECT
+    exit 0
+fi
 if [[ -r $f ]]; then
     if  (( $(( $(date +%s) - $(stat -c %Y $f ) )) < 60*10 )); then
         echo DIRECT
@@ -21,7 +25,7 @@ if [[ -r $f ]]; then
         fi
     fi
 fi
-if getent hosts $proxy_host && nc -z $proxy_host $proxy_port &>/dev/null; then
+if getent hosts $proxy_host &>/dev/null && timeout 1 nc -z $proxy_host $proxy_port &>/dev/null; then
     echo $proxy_url
 else
     if [[ ! -e $f || -w $f ]]; then