diff options
author | Daniel Baumann <daniel@debian.org> | 2011-01-07 21:56:33 +0100 |
---|---|---|
committer | Daniel Baumann <daniel@debian.org> | 2011-03-09 19:20:41 +0100 |
commit | 6d87f0dde3a22c9c49a727025913484e35819dbf (patch) | |
tree | 36de314485f69c21100ce5cec8c3216b1ae69e42 /scripts/build/lb_binary_debian-installer | |
parent | 8f4fb88a7161d924be52587d24087a4f10d60a75 (diff) | |
download | vyos-live-build-6d87f0dde3a22c9c49a727025913484e35819dbf.tar.gz vyos-live-build-6d87f0dde3a22c9c49a727025913484e35819dbf.zip |
Adding derivatives handling for progress.
Diffstat (limited to 'scripts/build/lb_binary_debian-installer')
-rwxr-xr-x | scripts/build/lb_binary_debian-installer | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/scripts/build/lb_binary_debian-installer b/scripts/build/lb_binary_debian-installer index 5a420274b..c2a7bacae 100755 --- a/scripts/build/lb_binary_debian-installer +++ b/scripts/build/lb_binary_debian-installer @@ -604,15 +604,15 @@ then # Generating release file mv binary chroot/root - eval _VERSION="$`echo RELEASE_${LB_DISTRIBUTION}`" + eval _VERSION="$`echo RELEASE_${LB_PARENT_DISTRIBUTION}`" - case "${LB_DISTRIBUTION}" in + case "${LB_PARENT_DISTRIBUTION}" in sid) _SUITE="unstable" ;; *) - _SUITE="${LB_DISTRIBUTION}" + _SUITE="${LB_PARENT_DISTRIBUTION}" ;; esac @@ -622,7 +622,7 @@ cd /root/binary && apt-ftparchive \ -o APT::FTPArchive::Release::Label="Debian" \ -o APT::FTPArchive::Release::Suite="${_SUITE}" \ -o APT::FTPArchive::Release::Version="${_VERSION}" \ - -o APT::FTPArchive::Release::Codename="${LB_DISTRIBUTION}" \ + -o APT::FTPArchive::Release::Codename="${LB_PARENT_DISTRIBUTION}" \ -o APT::FTPArchive::Release::Date="$(date -R)" \ -o APT::FTPArchive::Release::Architectures="${LB_ARCHITECTURES}" \ -o APT::FTPArchive::Release::Components="main" \ @@ -636,9 +636,9 @@ EOF DISTRIBUTIONS="frozen stable testing unstable" - if [ "${LB_DEBIAN_INSTALLER_DISTRIBUTION}" != "${LB_DISTRIBUTION}" ] + if [ "${LB_DEBIAN_INSTALLER_DISTRIBUTION}" != "${LB_PARENT_DISTRIBUTION}" ] then - DISTRIBUTIONS="${DISTRIBUTIONS} ${LB_DISTRIBUTION}" + DISTRIBUTIONS="${DISTRIBUTIONS} ${LB_PARENT_DISTRIBUTION}" fi case "${LB_BINARY_IMAGES}" in |