From 386f39939c0d4f43de5b8babc08ce7a290c4449d Mon Sep 17 00:00:00 2001 From: Mikaela Suomalainen Date: Wed, 22 Jul 2015 15:51:20 +0300 Subject: [PATCH] rc: workaround for apt Happy Eyeballs Closes #65 --- rc/bashrc | 4 +++- rc/zshrc | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/rc/bashrc b/rc/bashrc index 1a64f7be..09382d35 100644 --- a/rc/bashrc +++ b/rc/bashrc @@ -216,11 +216,13 @@ UNAME=$(uname) CPUARCH=$(uname -p) # If we are on Linux, enable apt progress bar and colours +# and Happy Eyeballs workaround https://pad.lv/1308200 if [[ $USER = "root" ]]; then mkdir -p /etc/apt/apt.conf.d/ echo 'Dpkg::Progress-Fancy "1";' > /etc/apt/apt.conf.d/99progressbar - echo 'DPkgPM::Progress-Fancy "1";' >> /etc/apt/apt.conf.d/99progressbar echo 'APT::Color "1";' > /etc/apt/apt.conf.d/99color + echo 'Acquire::http::Timeout "2";' > /etc/apt/apt.conf.d/99timeout + echo 'Acquire::ftp::Timeout "2";' >> /etc/apt/apt.conf.d/99timeout fi # Copied from http://homepages.see.leeds.ac.uk/~eeaol/notes/2012/03/how_to_only_type_ssh_passphrase_once/ diff --git a/rc/zshrc b/rc/zshrc index d23d53f6..8de6b0be 100644 --- a/rc/zshrc +++ b/rc/zshrc @@ -163,11 +163,13 @@ export SSH_AUTH_SOCK=/tmp/$USER.agent ssh-agent -a /tmp/$USER.agent > /dev/null 2>&1 # If we are on Linux, enable apt progress bar and colours +# and Happy Eyeballs workaround https://pad.lv/1308200 if [[ $USER = "root" ]]; then mkdir -p /etc/apt/apt.conf.d/ echo 'Dpkg::Progress-Fancy "1";' > /etc/apt/apt.conf.d/99progressbar - echo 'DPkgPM::Progress-Fancy "1";' >> /etc/apt/apt.conf.d/99progressbar echo 'APT::Color "1";' > /etc/apt/apt.conf.d/99color + echo 'Acquire::http::Timeout "2";' > /etc/apt/apt.conf.d/99timeout + echo 'Acquire::ftp::Timeout "2";' >> /etc/apt/apt.conf.d/99timeout fi # In our series useless/weird environment variables, beep