diff options
| author | Daniel Baumann <daniel@debian.org> | 2010-11-13 15:45:36 +0100 |
|---|---|---|
| committer | Daniel Baumann <daniel@debian.org> | 2011-03-09 19:17:28 +0100 |
| commit | 4914f5a0410e606b01910b97d6983f429f05c35f (patch) | |
| tree | 1ef59c18d0d57f1e768bb9add063998545f32935 | |
| parent | cfc2b0da1ff206582d00f8e58dd07ed93b1fa311 (diff) | |
| download | live-build-4914f5a0410e606b01910b97d6983f429f05c35f.zip live-build-4914f5a0410e606b01910b97d6983f429f05c35f.tar.gz | |
Making d-i indices copying depending on binary image type.
| -rwxr-xr-x | scripts/build/lb_binary_debian-installer | 27 |
1 files changed, 19 insertions, 8 deletions
diff --git a/scripts/build/lb_binary_debian-installer b/scripts/build/lb_binary_debian-installer index e257b4b..6ed331b 100755 --- a/scripts/build/lb_binary_debian-installer +++ b/scripts/build/lb_binary_debian-installer @@ -626,18 +626,29 @@ EOF rm -f chroot/binary.sh mv chroot/root/binary ./ - case "${LB_BINARY_FILESYSTEM}" in - fat*) - # Creating dist directories - for DISTRIBUTION in frozen stable testing unstable ${LB_DISTRIBUTION} - do - cp -a ${LB_DEBIAN_INSTALLER_DISTRIBUTION} binary/dists/${DISTRIBUTION} - done + DISTRIBUTIONS="frozen stable testing unstable" + + if [ "${LB_DEBIAN_INSTALLER_DISTRIBUTION}" != "${LB_DISTRIBUTION}" ] + then + DISTRIBUTIONS="${DISTRIBUTIONS} ${LB_DISTRIBUTION}" + fi + + case "${LB_BINARY_IMAGES}" in + usb-hdd) + case "${LB_BINARY_FILESYSTEM}" in + fat*) + # Creating dist directories + for DISTRIBUTION in ${DISTRIBUTIONS} + do + cp -a binary/dists/${LB_DEBIAN_INSTALLER_DISTRIBUTION} binary/dists/${DISTRIBUTION} + done + ;; + esac ;; *) # Creating dist symlinks - for DISTRIBUTION in frozen stable testing unstable ${LB_DISTRIBUTION} + for DISTRIBUTION in ${DISTRIBUTIONS} do ln -s ${LB_DEBIAN_INSTALLER_DISTRIBUTION} binary/dists/${DISTRIBUTION} done |