diff options
author | Jan Wagner <mail@jwagner.eu> | 2016-03-25 21:58:11 +0100 |
---|---|---|
committer | Jan Wagner <mail@jwagner.eu> | 2016-03-25 21:58:11 +0100 |
commit | b33dfc51ccafb9172c0a29c0e4376f0db8b9e3f1 (patch) | |
tree | 918f5d661c091cdac6bd6bcc28f677d0993f4369 /bootstrap.d/11-apt.sh | |
parent | 50170a27d4119c047344793bb7aec685acb3ad6e (diff) | |
download | rpi2-gen-image-b33dfc51ccafb9172c0a29c0e4376f0db8b9e3f1.tar.gz rpi2-gen-image-b33dfc51ccafb9172c0a29c0e4376f0db8b9e3f1.tar.bz2 rpi2-gen-image-b33dfc51ccafb9172c0a29c0e4376f0db8b9e3f1.zip |
Added: ENABLE_CRYPTFS - encrypted rootfs, use-latest-bootloader, cp-cleanup
Diffstat (limited to 'bootstrap.d/11-apt.sh')
-rw-r--r-- | bootstrap.d/11-apt.sh | 27 |
1 files changed, 17 insertions, 10 deletions
diff --git a/bootstrap.d/11-apt.sh b/bootstrap.d/11-apt.sh index 9610832..554aaf5 100644 --- a/bootstrap.d/11-apt.sh +++ b/bootstrap.d/11-apt.sh @@ -11,18 +11,25 @@ if [ -z "$APT_PROXY" ] ; then sed -i "s/\"\"/\"${APT_PROXY}\"/" "$R/etc/apt/apt.conf.d/10proxy" fi -# Install APT pinning configuration for flash-kernel package -install_readonly files/apt/flash-kernel "$R/etc/apt/preferences.d/flash-kernel" +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" -# Upgrade collabora package index and install collabora keyring -echo "deb https://repositories.collabora.co.uk/debian ${RELEASE} rpi2" > "$R/etc/apt/sources.list" -chroot_exec apt-get -qq -y update -chroot_exec apt-get -qq -y --force-yes install collabora-obs-archive-keyring + # 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" + + # 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 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" + # 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" +fi # Upgrade package index and update all installed packages and changed dependencies chroot_exec apt-get -qq -y update |