summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOtavio Salvador <otavio@ossystems.com.br>2010-09-26 20:19:38 +0000
committerDaniel Baumann <daniel@debian.org>2010-09-26 22:34:22 +0200
commit20268106fa67abea004731463f4a3f96797c7939 (patch)
treeeb4301d181ad5cb076f7a3f673cfeb5c11581301
parentc3e60adeb3371cd0815b93ff2be176d347b2c9f2 (diff)
downloadvyos-live-build-20268106fa67abea004731463f4a3f96797c7939.tar.gz
vyos-live-build-20268106fa67abea004731463f4a3f96797c7939.zip
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.
-rwxr-xr-xscripts/build/lb_binary_debian-installer4
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/build/lb_binary_debian-installer b/scripts/build/lb_binary_debian-installer
index 27fb29deb..8d7bab186 100755
--- a/scripts/build/lb_binary_debian-installer
+++ b/scripts/build/lb_binary_debian-installer
@@ -591,9 +591,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" \