diff options
| author | Lyndon Brown <jnqnfe@gmail.com> | 2020-03-15 22:18:01 +0000 |
|---|---|---|
| committer | Lyndon Brown <jnqnfe@gmail.com> | 2020-03-16 01:36:53 +0000 |
| commit | 3fb0bb235d9093415d2a70569850ac67c3435375 (patch) | |
| tree | ac09151755221c1ac39b25457f816388a935fc59 /scripts | |
| parent | 9a878350d3d4a85af16314448f28320558d5adfe (diff) | |
| download | vyos-live-build-3fb0bb235d9093415d2a70569850ac67c3435375.tar.gz vyos-live-build-3fb0bb235d9093415d2a70569850ac67c3435375.zip | |
installer: tidy package lists
`DI_PACKAGES` does not need to include `DI_REQ_PACKAGES` so long as
we pass the latter to apt in the one case where it was not already
being given it.
in fact with it including that sub-list meant that in the other
case where it was being given to apt, it actually just resulted in
duplication.
Gbp-Dch: Short
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/build/installer_debian-installer | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/scripts/build/installer_debian-installer b/scripts/build/installer_debian-installer index 48bb7455e..267a94c24 100755 --- a/scripts/build/installer_debian-installer +++ b/scripts/build/installer_debian-installer @@ -307,17 +307,17 @@ then case "${LB_ARCHITECTURES}" in amd64) DI_REQ_PACKAGES="lilo grub-pc" - DI_PACKAGES="${DI_REQ_PACKAGES} linux-image-amd64" + DI_PACKAGES="linux-image-amd64" ;; i386) DI_REQ_PACKAGES="lilo grub-pc" - DI_PACKAGES="${DI_REQ_PACKAGES} linux-image-686-pae" + DI_PACKAGES="linux-image-686-pae" ;; powerpc) DI_REQ_PACKAGES="yaboot" - DI_PACKAGES="${DI_REQ_PACKAGES} linux-image-powerpc linux-image-powerpc64 linux-image-powerpc-smp" + DI_PACKAGES="linux-image-powerpc linux-image-powerpc64 linux-image-powerpc-smp" ;; esac @@ -326,7 +326,6 @@ then case "${LB_MODE}" in debian) DI_REQ_PACKAGES="${DI_REQ_PACKAGES} console-setup keyboard-configuration kbd" - DI_PACKAGES="${DI_PACKAGES} console-setup keyboard-configuration kbd" ;; esac @@ -413,7 +412,7 @@ then done else # Download .debs of the required 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} fi mv chroot/binary.deb ./ |