From: Luke Kenneth Casson Leighton <lkcl@lkcl.net>
Date: Thu, 9 Sep 2021 14:12:05 +0000 (+0100)
Subject: ARGH getting really fed up with ISP transparent proxies that break
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=75c11995503ec263fe6f29ed72aefc8c7e2d030d;p=dev-env-setup.git

ARGH getting really fed up with ISP transparent proxies that break
---

diff --git a/coriolis2-chroot b/coriolis2-chroot
index 121f15a..b34527b 100755
--- a/coriolis2-chroot
+++ b/coriolis2-chroot
@@ -6,9 +6,18 @@ fi
 # Create coriolis chroot dir in /opt
 mkdir -p /opt/chroot/coriolis
 
+# argh apt with broken proxies and unreliable ISPs, getting fed up with it
+cat <<EOF >/tmp/brokenproxy
+APT::Acquire::Retries "20";
+APT::Get::Fix-Broken "true";
+Acquire::http::Pipeline-Depth "0";
+Acquire::http::No-Cache=True;
+Acquire::BrokenProxy=true;
+EOF
+
 echo "adding retries for debootstrap to not fail"
-echo 'APT::Acquire::Retries "10";' > /etc/apt/apt.conf.d/80-retries
-echo 'APT::Acquire::Retries "10";' > /opt/chroot/coriolis/etc/apt/apt.conf.d/80-retries
+cp /tmp/brokenproxy /etc/apt/apt.conf.d/80-retries
+cp /tmp/brokenproxy /opt/chroot/coriolis/etc/apt/apt.conf.d/80-retries
 
 # Install debootstrap and schroot via apt
 apt install -y debootstrap schroot
diff --git a/mk-deb-chroot b/mk-deb-chroot
index 23c0842..a30ef30 100755
--- a/mk-deb-chroot
+++ b/mk-deb-chroot
@@ -20,9 +20,17 @@ echo "Creating chroot dir '$chrootdir'"
 # Create coriolis chroot dir in /opt
 mkdir /opt/chroot/$chrootdir
 
-echo "adding retries for debootstrap to not fail"
-echo 'APT::Acquire::Retries "10";' > /etc/apt/apt.conf.d/80-retries
-echo 'APT::Acquire::Retries "10";' > /opt/chroot/$chrootdir/etc/apt/apt.conf.d/80-retries
+# argh apt with broken proxies and unreliable ISPs, getting fed up with it
+cat <<EOF >/tmp/brokenproxy
+APT::Acquire::Retries "20";
+APT::Get::Fix-Broken "true";
+Acquire::http::Pipeline-Depth "0";
+Acquire::http::No-Cache=True;
+Acquire::BrokenProxy=true;
+EOF
+
+cp /tmp/brokenproxy /etc/apt/apt.conf.d/80-retries
+cp /tmp/brokenproxy /opt/chroot/coriolis/etc/apt/apt.conf.d/80-retries
 
 # Install debootstrap and schroot
 if [ -e /etc/debian_version ]; then