diff options
| author | Chris Lamb <chris@chris-lamb.co.uk> | 2008-03-22 02:44:18 +0000 |
|---|---|---|
| committer | Chris Lamb <chris@chris-lamb.co.uk> | 2008-03-22 02:44:18 +0000 |
| commit | 9e6c04702f87181df9c2e8b770eb20b46a6405fb (patch) | |
| tree | b3a6133c112faa05b3dfff0a79e7a0b8bc2014ea | |
| parent | 9321c451882b9a0443a5eb148589112f3e95a117 (diff) | |
| download | vyos-live-build-9e6c04702f87181df9c2e8b770eb20b46a6405fb.tar.gz vyos-live-build-9e6c04702f87181df9c2e8b770eb20b46a6405fb.zip | |
lh_chroot_linux-image: Install dependencies differently when using aptitude
We must use "aptitude install <pkgname>" to install dependencies of a
dpkg-installed <pkgname>, or aptitude's resolver will remove it. apt-get
does not have this "feature".
This was causing a problem when using a custom versions of live-initramfs
as they would be removed, causing a boot failure.
Signed-off-by: Chris Lamb <chris@chris-lamb.co.uk>
| -rwxr-xr-x | helpers/lh_chroot_linux-image | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/helpers/lh_chroot_linux-image b/helpers/lh_chroot_linux-image index 59e5dd31a..c409b7720 100755 --- a/helpers/lh_chroot_linux-image +++ b/helpers/lh_chroot_linux-image @@ -98,8 +98,15 @@ EOF Chroot "find /root -name *.deb" > chroot/root/initfs Chroot "xargs --arg-file=/root/initfs dpkg -i" || true - # Cleaning dependencies - Apt install -f + # Install dependencies + case "${LH_APT}" in + aptitude) + Apt install ${LH_INITRAMFS} + ;; + apt-get) + Apt install -f + ;; + esac # Removing package files rm -f chroot/root/${LH_INITRAMFS}*.deb |