From 33f80bc9c1535353e311afc408fe44adec46f91d Mon Sep 17 00:00:00 2001
From: SG <13872653+mmguero@users.noreply.github.com>
Date: Tue, 9 Feb 2021 13:35:25 -0700
Subject: [PATCH] Update Vagrantfile in order to hold grub-pc package to not
 upgrade

---
 malcolm-iso/vagrant/Vagrantfile | 18 ++++++++++--------
 sensor-iso/vagrant/Vagrantfile  | 18 ++++++++++--------
 2 files changed, 20 insertions(+), 16 deletions(-)

diff --git a/malcolm-iso/vagrant/Vagrantfile b/malcolm-iso/vagrant/Vagrantfile
index 0ba5721f8..478c980f8 100644
--- a/malcolm-iso/vagrant/Vagrantfile
+++ b/malcolm-iso/vagrant/Vagrantfile
@@ -30,15 +30,17 @@ Vagrant.configure("2") do |config|
   end
 
   config.vm.provision "shell", inline: <<-STEP1
+    dpkg-reconfigure debconf -f noninteractive -p critical
     export DEBIAN_FRONTEND=noninteractive
-    apt-get update
-    apt-get dist-upgrade -y
+    apt-mark hold grub-pc
+    apt-get -qqy update
+    apt-get -y dist-upgrade
     sed -i "s/main/main contrib non-free/g" /etc/apt/sources.list
     echo "deb http://httpredir.debian.org/debian/ buster-backports main contrib non-free" >> /etc/apt/sources.list
     echo "deb-src http://httpredir.debian.org/debian/ buster-backports main contrib non-free" >> /etc/apt/sources.list
-    apt-get update
+    apt-get -qqy update
     export KERNEL_VERSION=$(apt-cache search linux-image-5.9 | grep -Pv -- '(-(rt|cloud)-amd64|amd64-(dbg|unsigned))' | sort -r --sort=version | awk '{print $1}' | head -n 1 | sed 's/^linux-image-//' | sed 's/-amd64$//')
-    apt-get -t buster-backports install -y \
+    apt-get -t buster-backports -y install \
       linux-image-$KERNEL_VERSION-amd64 linux-headers-$KERNEL_VERSION-amd64 linux-headers-$KERNEL_VERSION-common \
       dkms build-essential linux-kbuild-5.9 linux-compiler-gcc-8-x86 \
       firmware-linux firmware-linux-nonfree firmware-misc-nonfree firmware-amd-graphics
@@ -48,14 +50,14 @@ Vagrant.configure("2") do |config|
 
   config.vm.provision "shell", inline: <<-STEP2
     export DEBIAN_FRONTEND=noninteractive
-    apt-get update
-    apt-get -t buster-backports install -y \
+    apt-get -qqy update
+    apt-get -t buster-backports -y install \
       rsync git live-build debootstrap xorriso squashfs-tools genisoimage pandoc imagemagick \
       apt-transport-https ca-certificates curl gnupg2 software-properties-common
     curl -fsSL https://download.docker.com/linux/debian/gpg | apt-key add -
     add-apt-repository "deb [arch=amd64] https://download.docker.com/linux/debian $(lsb_release -cs) stable"
-    apt-get update
-    sudo apt-get install -y docker-ce docker-ce-cli containerd.io
+    apt-get -qqy update
+    apt-get -y install docker-ce docker-ce-cli containerd.io
     usermod -a -G docker vagrant
   STEP2
 end
diff --git a/sensor-iso/vagrant/Vagrantfile b/sensor-iso/vagrant/Vagrantfile
index efdbad1f1..90fa4dabf 100644
--- a/sensor-iso/vagrant/Vagrantfile
+++ b/sensor-iso/vagrant/Vagrantfile
@@ -30,15 +30,17 @@ Vagrant.configure("2") do |config|
   end
 
   config.vm.provision "shell", inline: <<-STEP1
+    dpkg-reconfigure debconf -f noninteractive -p critical
     export DEBIAN_FRONTEND=noninteractive
-    apt-get update
-    apt-get dist-upgrade -y
+    apt-mark hold grub-pc
+    apt-get -qqy update
+    apt-get -y dist-upgrade
     sed -i "s/main/main contrib non-free/g" /etc/apt/sources.list
     echo "deb http://httpredir.debian.org/debian/ buster-backports main contrib non-free" >> /etc/apt/sources.list
     echo "deb-src http://httpredir.debian.org/debian/ buster-backports main contrib non-free" >> /etc/apt/sources.list
-    apt-get update
+    apt-get -qqy update
     export KERNEL_VERSION=$(apt-cache search linux-image-5.9 | grep -Pv -- '(-(rt|cloud)-amd64|amd64-(dbg|unsigned))' | sort -r --sort=version | awk '{print $1}' | head -n 1 | sed 's/^linux-image-//' | sed 's/-amd64$//')
-    apt-get -t buster-backports install -y \
+    apt-get -t buster-backports -y install \
       linux-image-$KERNEL_VERSION-amd64 linux-headers-$KERNEL_VERSION-amd64 linux-headers-$KERNEL_VERSION-common \
       dkms build-essential linux-kbuild-5.9 linux-compiler-gcc-8-x86 \
       firmware-linux firmware-linux-nonfree firmware-misc-nonfree firmware-amd-graphics
@@ -48,14 +50,14 @@ Vagrant.configure("2") do |config|
 
   config.vm.provision "shell", inline: <<-STEP2
     export DEBIAN_FRONTEND=noninteractive
-    apt-get update
-    apt-get -t buster-backports install -y \
+    apt-get -qqy update
+    apt-get -t buster-backports -y install \
       rsync git live-build debootstrap xorriso squashfs-tools genisoimage pandoc imagemagick \
       apt-transport-https ca-certificates curl gnupg2 software-properties-common
     curl -fsSL https://download.docker.com/linux/debian/gpg | apt-key add -
     add-apt-repository "deb [arch=amd64] https://download.docker.com/linux/debian $(lsb_release -cs) stable"
-    apt-get update
-    sudo apt-get install -y docker-ce docker-ce-cli containerd.io
+    apt-get -qqy update
+    apt-get -y install docker-ce docker-ce-cli containerd.io
     usermod -a -G docker vagrant
   STEP2
 end