aboutsummaryrefslogtreecommitdiff
path: root/bootstrap.d/11-apt.sh
diff options
context:
space:
mode:
authorJan Wagner <mail@jwagner.eu>2016-03-13 13:40:33 +0100
committerJan Wagner <mail@jwagner.eu>2016-03-13 13:40:33 +0100
commitb855bcffebe13327660e4e7955de5e38018bcb90 (patch)
tree9989072c0557d00d4fafbdcdffe3cc262ad03273 /bootstrap.d/11-apt.sh
parent94ac6dc790aa5066b623e9706bdf0c98f7d40aa7 (diff)
downloadrpi2-gen-image-b855bcffebe13327660e4e7955de5e38018bcb90.tar.gz
rpi2-gen-image-b855bcffebe13327660e4e7955de5e38018bcb90.tar.bz2
rpi2-gen-image-b855bcffebe13327660e4e7955de5e38018bcb90.zip
comment-cleanup, net-cleanup, size-calc-fix, split-more, menuconfig
Diffstat (limited to 'bootstrap.d/11-apt.sh')
-rw-r--r--bootstrap.d/11-apt.sh6
1 files changed, 3 insertions, 3 deletions
diff --git a/bootstrap.d/11-apt.sh b/bootstrap.d/11-apt.sh
index 56fcc0e..3ee51d8 100644
--- a/bootstrap.d/11-apt.sh
+++ b/bootstrap.d/11-apt.sh
@@ -5,13 +5,13 @@
# Load utility functions
. ./functions.sh
-# Use proxy inside chroot
+# Install and setup APT proxy configuration
if [ -z "$APT_PROXY" ] ; then
install_readonly files/apt/10proxy $R/etc/apt/apt.conf.d/10proxy
sed -i "s/\"\"/\"${APT_PROXY}\"/" $R/etc/apt/apt.conf.d/10proxy
fi
-# Pin package flash-kernel to repositories.collabora.co.uk
+# Install APT pinning configuration for flash-kernel package
install_readonly files/apt/flash-kernel $R/etc/apt/preferences.d/flash-kernel
# Upgrade collabora package index and install collabora keyring
@@ -19,7 +19,7 @@ echo "deb https://repositories.collabora.co.uk/debian ${RELEASE} rpi2" >$R/etc/a
chroot_exec apt-get -qq -y update
chroot_exec apt-get -qq -y --force-yes install collabora-obs-archive-keyring
-# Set up initial sources.list
+# Install APT sources.list
install_readonly files/apt/sources.list $R/etc/apt/sources.list
sed -i "s/\/ftp.debian.org\//\/${APT_SERVER}\//" $R/etc/apt/sources.list
sed -i "s/ jessie/ ${RELEASE}/" $R/etc/apt/sources.list