[SCM] live-build branch, debian-old-2.0, updated. debian/2.0_a1-1-376-g57a0e3b
Daniel Baumann
daniel at debian.org
Sun Sep 26 21:19:03 UTC 2010
The following commit has been merged in the debian-old-2.0 branch:
commit 57a0e3b626017f0750d3ba5345b8db47d52ce1ed
Author: Otavio Salvador <otavio at ossystems.com.br>
Date: Sun Sep 26 23:18:36 2010 +0200
Fixing debian-installer Release file generation.
To behave properly installer properly handles codename/suite
combination. Specially for sid/unstable this is really required
otherwise we can end up trying to configure a broken sources.list.
diff --git a/scripts/build/lb_binary_debian-installer b/scripts/build/lb_binary_debian-installer
index d1f99b7..b097f94 100755
--- a/scripts/build/lb_binary_debian-installer
+++ b/scripts/build/lb_binary_debian-installer
@@ -600,9 +600,9 @@ cat > chroot/binary.sh << EOF
cd /root/binary && apt-ftparchive \
-o APT::FTPArchive::Release::Origin="Debian" \
-o APT::FTPArchive::Release::Label="Debian" \
- -o APT::FTPArchive::Release::Suite="${LB_DEBIAN_INSTALLER_DISTRIBUTION}" \
+ -o APT::FTPArchive::Release::Suite="${LB_DISTRIBUTION/sid/unstable}" \
-o APT::FTPArchive::Release::Version="4.0" \
- -o APT::FTPArchive::Release::Codename="${LB_DEBIAN_INSTALLER_DISTRIBUTION}" \
+ -o APT::FTPArchive::Release::Codename="${LB_DISTRIBUTION}" \
-o APT::FTPArchive::Release::Date="$(date -R)" \
-o APT::FTPArchive::Release::Architectures="${LB_ARCHITECTURE}" \
-o APT::FTPArchive::Release::Components="main" \
--
live-build
More information about the debian-live-changes
mailing list