diff options
| author | Daniel Baumann <mail@daniel-baumann.ch> | 2014-11-10 19:48:53 +0100 |
|---|---|---|
| committer | Daniel Baumann <mail@daniel-baumann.ch> | 2014-11-10 19:48:53 +0100 |
| commit | 61a166adea60c8f5500f7d2e300f84807b9b17ac (patch) | |
| tree | 015b9a96510bdbf5c30bc827bc1b1575c12a5451 | |
| parent | a157fbb3615b46f37e0ac6c926376559bbd415c5 (diff) | |
| download | vyos-live-build-61a166adea60c8f5500f7d2e300f84807b9b17ac.tar.gz vyos-live-build-61a166adea60c8f5500f7d2e300f84807b9b17ac.zip | |
Applying patch from Gabriele Gristina <gabriele.gristina@gmail.com> to fix automated checks for using aptitude.
| -rwxr-xr-x | scripts/build/bootstrap_archives | 4 | ||||
| -rwxr-xr-x | scripts/build/chroot_archives | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/scripts/build/bootstrap_archives b/scripts/build/bootstrap_archives index f5816e2cb..1437e7416 100755 --- a/scripts/build/bootstrap_archives +++ b/scripts/build/bootstrap_archives @@ -244,8 +244,8 @@ then done fi -# Installing aptitude (FIXME) -if [ "${LB_APT}" = "aptitude" ] && [ ! -x /usr/bin/aptitude ] +# Installing aptitude +if [ "${LB_APT}" = "aptitude" ] && [ ! -x chroot/usr/bin/aptitude ] then Chroot chroot "apt-get ${APT_OPTIONS} update" Chroot chroot "apt-get ${APT_OPTIONS} install aptitude" diff --git a/scripts/build/chroot_archives b/scripts/build/chroot_archives index bae743972..457d60e7b 100755 --- a/scripts/build/chroot_archives +++ b/scripts/build/chroot_archives @@ -456,8 +456,8 @@ EOF done fi - # Installing aptitude (FIXME) - if [ "${LB_APT}" = "aptitude" ] && [ ! -x /usr/bin/aptitude ] + # Installing aptitude + if [ "${LB_APT}" = "aptitude" ] && [ ! -x /chroot/usr/bin/aptitude ] then Chroot chroot "apt-get ${APT_OPTIONS} update" Chroot chroot "apt-get ${APT_OPTIONS} install aptitude" |