Commit 85a5f5b6 authored by Wolfgang Schweer's avatar Wolfgang Schweer
Browse files

base-installer: Drop workaround for bug #565555 (squid related). 

 This bug has been fixed in 2015, testing has shown that the workaround
 isn't needed anymore.
parent fa6795ed

base-installer

+0 −9
Original line number Diff line number Diff line
@@ -26,15 +26,6 @@ if [ -e /dev/$VG/debianedufreespace ] ; then 
    fi

fi



# Need to do this here, as apt need to work via Squid to install

# debian-edu-config where the permanent file is included.

# FIXME check if this still is needed.  See BTS report #565555.

log "adding /etc/apt/apt.conf.d/90squid-di working around bug in Squid."

cat > /target/etc/apt/apt.conf.d/90squid-di <<EOF

// Avoid Squid handing out corrupt packages, solves Skolelinux bug #1419.

Acquire::http::Pipeline-Depth 0;

EOF



log "setting up aptkey"

if [ -f /usr/share/keyrings/archive.gpg -a ! -f /target/etc/apt/trusted.gpg ] ; then

    log "creating /etc/apt in target"

debian/changelog

+3 −0
Original line number Diff line number Diff line
@@ -9,6 +9,9 @@ debian-edu-install (2.10.13) UNRELEASED; urgency=medium 
    - debian/debian-edu-profile-udeb.postinst: Prevent pkgsel from running

      'apt-get clean'; the cache is cleaned anyway at the very end of the

      installation.

  * base-installer: Drop workaround for bug #565555 (squid related). This bug

    has been fixed in 2015, testing has shown that the workaround isn't needed

    anymore.



 -- Holger Levsen <holger@debian.org>  Mon, 27 Aug 2018 12:05:04 +0200