diff options
| author | Holger Levsen <holger@layer-acht.org> | 2014-12-17 10:55:54 +0100 |
|---|---|---|
| committer | Holger Levsen <holger@layer-acht.org> | 2014-12-17 10:55:54 +0100 |
| commit | 6b563ccd8f2d108cd91c99c565c3a92cbd4f2e07 (patch) | |
| tree | c2ea0f10745e860d3424485274edb87e076b9c6c | |
| parent | cefc1ca9e46d6ad065e2cf443e43b37f9305bc0c (diff) | |
| download | jenkins.debian.net-6b563ccd8f2d108cd91c99c565c3a92cbd4f2e07.tar.xz | |
remove last traces of contrib and non-free
| -rwxr-xr-x | bin/chroot-installation.sh | 4 | ||||
| -rw-r--r-- | etc/apt/sources.list | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/bin/chroot-installation.sh b/bin/chroot-installation.sh index b7b43512..c82f25c9 100755 --- a/bin/chroot-installation.sh +++ b/bin/chroot-installation.sh @@ -51,7 +51,7 @@ mount /proc -t proc /proc echo -e '#!/bin/sh\nexit 101' > /usr/sbin/policy-rc.d chmod +x /usr/sbin/policy-rc.d echo 'Acquire::http::Proxy "http://localhost:3128";' > /etc/apt/apt.conf.d/80proxy -echo "deb-src $MIRROR $1 main contrib non-free" >> /etc/apt/sources.list +echo "deb-src $MIRROR $1 main" >> /etc/apt/sources.list apt-get update set +x EOF @@ -99,7 +99,7 @@ echo "set +x" >> $CTMPFILE prepare_upgrade2() { cat >> $CTMPFILE <<-EOF -echo "deb $MIRROR $1 main contrib non-free" >> /etc/apt/sources.list +echo "deb $MIRROR $1 main" >> /etc/apt/sources.list $SCRIPT_HEADER set -x apt-get update diff --git a/etc/apt/sources.list b/etc/apt/sources.list index 3d46cb72..74d7ad25 100644 --- a/etc/apt/sources.list +++ b/etc/apt/sources.list @@ -6,7 +6,7 @@ deb http://ftp.de.debian.org/debian/ wheezy main #deb-src http://ftp.de.debian.org/debian/ wheezy main # needed for job/reproducible* -deb-src http://ftp.de.debian.org/debian/ sid main contrib +deb-src http://ftp.de.debian.org/debian/ sid main deb http://security.debian.org/ wheezy/updates main #deb-src http://security.debian.org/ wheezy/updates main |