diff options
| author | Daniel Baumann <daniel@debian.org> | 2012-04-27 00:20:40 +0200 |
|---|---|---|
| committer | Daniel Baumann <daniel@debian.org> | 2012-04-27 00:20:40 +0200 |
| commit | 0af78a1f67c04d2561e8134deb565b6f5ccf6a77 (patch) | |
| tree | a826798c927fbc29aabd7acba74f2393b8837228 | |
| parent | 678f2c1cfb9ab3aba67c35a152dc47decfd7ecd6 (diff) | |
| download | vyos-live-build-0af78a1f67c04d2561e8134deb565b6f5ccf6a77.tar.gz vyos-live-build-0af78a1f67c04d2561e8134deb565b6f5ccf6a77.zip | |
Slight reordering in lb_binary_debian-installer.
| -rwxr-xr-x | scripts/build/lb_binary_debian-installer | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/scripts/build/lb_binary_debian-installer b/scripts/build/lb_binary_debian-installer index 904f1c626..003051bc7 100755 --- a/scripts/build/lb_binary_debian-installer +++ b/scripts/build/lb_binary_debian-installer @@ -339,11 +339,6 @@ then # Downloading additional packages mkdir -p chroot/binary.deb/archives/partial - for _ARCHIVE_AREA in $(echo ${LB_PARENT_ARCHIVE_AREAS} ${LB_ARCHIVE_AREAS}) - do - mkdir -p binary/pool/${_ARCHIVE_AREA} - done - mv chroot/var/lib/dpkg/status chroot/var/lib/dpkg/status.tmp touch chroot/var/lib/dpkg/status @@ -489,8 +484,7 @@ then mv chroot/var/lib/dpkg/status.tmp chroot/var/lib/dpkg/status # Download .debs of the required packages - Chroot chroot ${_LB_APT_COMMAND} install ${DI_REQ_PACKAGES} - Chroot chroot ${_LB_APT_COMMAND} install ${DI_PACKAGES} ${DI_FIRMWARE_PACKAGES} + Chroot chroot ${_LB_APT_COMMAND} install ${DI_PACKAGES} ${DI_FIRMWARE_PACKAGES} ${DI_REQ_PACKAGES} else # Download .debs of the required packages Chroot chroot ${_LB_APT_COMMAND} install ${DI_PACKAGES} ${DI_FIRMWARE_PACKAGES} @@ -501,6 +495,11 @@ then mv chroot/binary.deb ./ + for _ARCHIVE_AREA in $(echo ${LB_PARENT_ARCHIVE_AREAS} ${LB_ARCHIVE_AREAS}) + do + mkdir -p binary/pool/${_ARCHIVE_AREA} + done + if Find_files binary.deb/archives/*.deb then for FILE in binary.deb/archives/*.deb |