[tor-commits] [gitian-builder/tor-browser-builder-4] Bug 22467: Don't break upgrade on Jessie VM

[gk at torproject.org]

commit cbcaacd2152ca43ebc51874dcbb074de14dcc392
Author: Georg Koppen <gk at torproject.org>
Date:   Thu Aug 3 09:19:58 2017 +0000

    Bug 22467: Don't break upgrade on Jessie VM
    
    The problem seems to be related to `linux-image-xxxx` trying to upgrade
    itself during `dist-upgrade` while `grub` is not installed, which causes
    the post-installation script to fail. The idea is to ensure that
    `linux-image-xxxx` is upgraded before removing `grub` and doing
    `dist-upgrade`.
    
    This patch was done by David Fifield
---
 target-bin/upgrade-system.sh | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/target-bin/upgrade-system.sh b/target-bin/upgrade-system.sh
index 9384229..795c3b9 100644
--- a/target-bin/upgrade-system.sh
+++ b/target-bin/upgrade-system.sh
@@ -6,6 +6,9 @@ set -e
 
 mkdir -p /var/cache/gitian
 
+DEBIAN_FRONTEND=noninteractive apt-get -y install grub
+DEBIAN_FRONTEND=noninteractive apt-get -y install linux-image-$(uname -r)
+
 # remove obsolete grub, it causes package dependency issues
 apt-get -q -y purge grub > /dev/null 2>&1 || true