diff options
author | Jan Wagner <mail@jwagner.eu> | 2016-04-19 15:10:50 +0200 |
---|---|---|
committer | Jan Wagner <mail@jwagner.eu> | 2016-04-19 15:10:50 +0200 |
commit | d0f91512d9ca6d361d8a4a387094c48aab00e111 (patch) | |
tree | b00ed220e2fa04bdb1db43475a8149d01d1be5db /bootstrap.d/11-apt.sh | |
parent | 7878e85af7748d531a64f459723dca76ee37914b (diff) | |
download | rpi2-gen-image-master.tar.gz rpi2-gen-image-master.tar.bz2 rpi2-gen-image-master.zip |
Diffstat (limited to 'bootstrap.d/11-apt.sh')
-rw-r--r-- | bootstrap.d/11-apt.sh | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/bootstrap.d/11-apt.sh b/bootstrap.d/11-apt.sh index 554aaf5..1d32051 100644 --- a/bootstrap.d/11-apt.sh +++ b/bootstrap.d/11-apt.sh @@ -7,28 +7,28 @@ # 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" + install_readonly files/apt/10proxy "${ETCDIR}/apt/apt.conf.d/10proxy" + sed -i "s/\"\"/\"${APT_PROXY}\"/" "${ETCDIR}/apt/apt.conf.d/10proxy" fi if [ "$BUILD_KERNEL" = false ] ; then # Install APT pinning configuration for flash-kernel package - install_readonly files/apt/flash-kernel "$R/etc/apt/preferences.d/flash-kernel" + install_readonly files/apt/flash-kernel "${ETCDIR}/apt/preferences.d/flash-kernel" # Install APT sources.list - install_readonly files/apt/sources.list "$R/etc/apt/sources.list" - echo "deb https://repositories.collabora.co.uk/debian ${RELEASE} rpi2" >> "$R/etc/apt/sources.list" + install_readonly files/apt/sources.list "${ETCDIR}/apt/sources.list" + echo "deb https://repositories.collabora.co.uk/debian ${RELEASE} rpi2" >> "${ETCDIR}/apt/sources.list" # Upgrade collabora package index and install collabora keyring chroot_exec apt-get -qq -y update chroot_exec apt-get -qq -y --force-yes install collabora-obs-archive-keyring else # BUILD_KERNEL=true # Install APT sources.list - install_readonly files/apt/sources.list "$R/etc/apt/sources.list" + install_readonly files/apt/sources.list "${ETCDIR}/apt/sources.list" # Use specified APT server and release - sed -i "s/\/ftp.debian.org\//\/${APT_SERVER}\//" "$R/etc/apt/sources.list" - sed -i "s/ jessie/ ${RELEASE}/" "$R/etc/apt/sources.list" + sed -i "s/\/ftp.debian.org\//\/${APT_SERVER}\//" "${ETCDIR}/apt/sources.list" + sed -i "s/ jessie/ ${RELEASE}/" "${ETCDIR}/apt/sources.list" fi # Upgrade package index and update all installed packages and changed dependencies |