2 files changed, 14 insertions, 1 deletions
diff --git a/contrib/cirrus/packer/fedora_setup.sh b/contrib/cirrus/packer/fedora_setup.sh
index d948a0afa..679ad3b8d 100644
--- a/contrib/cirrus/packer/fedora_setup.sh
+++ b/contrib/cirrus/packer/fedora_setup.sh
@@ -26,6 +26,7 @@ ooe.sh sudo dnf install -y \
     atomic-registries \
     autoconf \
     automake \
+    bash-completion \
     bats \
     bridge-utils \
     btrfs-progs-devel \
@@ -54,6 +55,7 @@ ooe.sh sudo dnf install -y \
     jq \
     libassuan-devel \
     libcap-devel \
+    libmsi1 \
     libnet \
     libnet-devel \
     libnl3-devel \
@@ -64,9 +66,11 @@ ooe.sh sudo dnf install -y \
     libvarlink-util \
     lsof \
     make \
+    msitools \
     nmap-ncat \
     ostree \
     ostree-devel \
+    pandoc \
     podman \
     procps-ng \
     protobuf \
diff --git a/contrib/cirrus/packer/ubuntu_setup.sh b/contrib/cirrus/packer/ubuntu_setup.sh
index d20e7e005..2f54da9ed 100644
--- a/contrib/cirrus/packer/ubuntu_setup.sh
+++ b/contrib/cirrus/packer/ubuntu_setup.sh
@@ -18,8 +18,16 @@ trap "sudo rm -rf $GOPATH" EXIT
 # Ensure there are no disruptive periodic services enabled by default in image
 systemd_banish
 
+# Stop disruption upon boot ASAP after booting
+echo "Disabling all packaging activity on boot"
+# Don't let sed process sed's temporary files
+_FILEPATHS=$(sudo ls -1 /etc/apt/apt.conf.d)
+for filename in $_FILEPATHS; do \
+    echo "Checking/Patching $filename"
+    sudo sed -i -r -e "s/$PERIODIC_APT_RE/"'\10"\;/' "/etc/apt/apt.conf.d/$filename"; done
+
 echo "Updating/configuring package repositories."
-$LILTO $SUDOAPTGET update
+$BIGTO $SUDOAPTGET update
 
 echo "Upgrading all packages"
 $BIGTO $SUDOAPTGET upgrade
@@ -41,6 +49,7 @@ $BIGTO $SUDOAPTGET install \
     aufs-tools \
     autoconf \
     automake \
+    bash-completion \
     bats \
     bison \
     btrfs-tools \