diff options
| author | Lyndon Brown <jnqnfe@gmail.com> | 2020-03-15 21:22:53 +0000 |
|---|---|---|
| committer | Lyndon Brown <jnqnfe@gmail.com> | 2020-03-16 01:36:53 +0000 |
| commit | 9a878350d3d4a85af16314448f28320558d5adfe (patch) | |
| tree | de522bf25ed0123f69ba0686a33062951be824cb | |
| parent | 2abf7bc65ba43503954a07ab3390f0756a986877 (diff) | |
| download | vyos-live-build-9a878350d3d4a85af16314448f28320558d5adfe.tar.gz vyos-live-build-9a878350d3d4a85af16314448f28320558d5adfe.zip | |
installer: misc small tweaks
Gbp-Dch: Ignore
| -rwxr-xr-x | scripts/build/installer_debian-installer | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/scripts/build/installer_debian-installer b/scripts/build/installer_debian-installer index 4a0ef5be8..48bb7455e 100755 --- a/scripts/build/installer_debian-installer +++ b/scripts/build/installer_debian-installer @@ -216,6 +216,7 @@ Download_file () { fi fi + # Use hardlink if same device if [ "$(stat --printf %d "${_LB_CACHE_DIR}/")" = "$(stat --printf %d ./)" ] then CP_OPTIONS="-l" @@ -402,7 +403,7 @@ then # Download .debs of the required packages Chroot chroot ${_LB_APT_COMMAND} install ${DI_PACKAGES} ${DI_FIRMWARE_PACKAGES} ${DI_REQ_PACKAGES} - # Drop the packages already installed that d-i doesn't explicitely need + # Drop the packages already installed that d-i doesn't explicitly need _REMAINING_PACKAGES="$(echo ${DI_FIRMWARE_PACKAGES} ${DI_REQ_PACKAGES} | sed -e 's# #|#g')" _REMAINING_PACKAGES="$(Chroot_package_list chroot | grep -E -v "^(${_REMAINING_PACKAGES})\$")" @@ -417,8 +418,7 @@ then mv chroot/binary.deb ./ - for _ARCHIVE_AREA in $(echo ${LB_PARENT_ARCHIVE_AREAS} ${LB_ARCHIVE_AREAS}) - do + for _ARCHIVE_AREA in ${LB_PARENT_ARCHIVE_AREAS} ${LB_ARCHIVE_AREAS}; do mkdir -p binary/pool/${_ARCHIVE_AREA} done |