diff options
| author | Daniel Baumann <daniel@debian.org> | 2011-09-28 07:09:05 +0200 |
|---|---|---|
| committer | Daniel Baumann <daniel@debian.org> | 2011-09-28 07:26:02 +0200 |
| commit | c2b7c107a5240b7c03298bfa1c31e67257d5bf20 (patch) | |
| tree | 9d4be351e516ec91da053296409e8181fa7f653b /scripts | |
| parent | 0b08f4529e6645a8ece3311e4273f7ef831708cc (diff) | |
| download | vyos-live-build-c2b7c107a5240b7c03298bfa1c31e67257d5bf20.tar.gz vyos-live-build-c2b7c107a5240b7c03298bfa1c31e67257d5bf20.zip | |
Correcting check for debian-installer-distribution when using daily images in non-derivatives mode.
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/build/lb_binary_debian-installer | 38 |
1 files changed, 25 insertions, 13 deletions
diff --git a/scripts/build/lb_binary_debian-installer b/scripts/build/lb_binary_debian-installer index 08775180a..55691a6a5 100755 --- a/scripts/build/lb_binary_debian-installer +++ b/scripts/build/lb_binary_debian-installer @@ -242,20 +242,32 @@ VMLINUZ_GI="gtk/vmlinuz" INITRD_GI="gtk/initrd.gz" DESTDIR_GI="${DESTDIR}/gtk" -if [ "${LB_PARENT_DEBIAN_INSTALLER_DISTRIBUTION}" = "daily" ] -then - LB_PARENT_DEBIAN_INSTALLER_DISTRIBUTION="sid" +case "${LB_DERIVATIVE}" in + false) + if [ "${LB_DEBIAN_INSTALLER_DISTRIBUTION}" = "daily" ] + then + # FIXME: variable name should be decupled from derivatves + LB_PARENT_DEBIAN_INSTALLER_DISTRIBUTION="sid" - # Debian Installer daily builds - URL="http://d-i.debian.org/daily-images/${LB_ARCHITECTURES}/daily/" -else - if [ "${LB_DERIVATIVE}" = "true" ] - then - URL="${LB_MIRROR_DEBIAN_INSTALLER}/dists/${LB_DEBIAN_INSTALLER_DISTRIBUTION}/main/installer-${LB_ARCHITECTURES}/current/images/" - else - URL="${LB_PARENT_MIRROR_DEBIAN_INSTALLER}/dists/${LB_PARENT_DEBIAN_INSTALLER_DISTRIBUTION}/main/installer-${LB_ARCHITECTURES}/current/images/" - fi -fi + # Debian Installer daily builds + URL="http://d-i.debian.org/daily-images/${LB_ARCHITECTURES}/daily/" + else + URL="${LB_MIRROR_DEBIAN_INSTALLER}/dists/${LB_DEBIAN_INSTALLER_DISTRIBUTION}/main/installer-${LB_ARCHITECTURES}/current/images/" + fi + ;; + + true) + if [ "${LB_PARENT_DEBIAN_INSTALLER_DISTRIBUTION}" = "daily" ] + then + LB_PARENT_DEBIAN_INSTALLER_DISTRIBUTION="sid" + + # Debian Installer daily builds + URL="http://d-i.debian.org/daily-images/${LB_ARCHITECTURES}/daily/" + else + URL="${LB_PARENT_MIRROR_DEBIAN_INSTALLER}/dists/${LB_PARENT_DEBIAN_INSTALLER_DISTRIBUTION}/main/installer-${LB_ARCHITECTURES}/current/images/" + fi + ;; +esac mkdir -p "${DESTDIR_DI}" |