summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorOtavio Salvador <otavio@ossystems.com.br>2010-09-26 23:18:36 +0200
committerDaniel Baumann <daniel@debian.org>2011-03-09 19:17:24 +0100
commitf7de27c03be1331a61299f2fe6982ec194268d79 (patch)
tree0b3740c48caad34567529df30682cffe2295d6bb /scripts
parentfc58666619263486986e87e82b4f727bec18a847 (diff)
downloadlive-build-f7de27c03be1331a61299f2fe6982ec194268d79.zip
live-build-f7de27c03be1331a61299f2fe6982ec194268d79.tar.gz
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.
Diffstat (limited to 'scripts')
-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 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" \