Revert changes with held packages

config/install.sh

@@ -125,7 +125,10 @@ then
 fi
 
 # For the NAT node
-apt-get install -y libvirt-daemon-system
+apt-get install -y --allow-change-held-packages libvirt-daemon-system
+
+# Prevent libvirt-daemon-system to be uninstalled by cleaner.sh
+apt-mark hold libvirt-daemon-system
 
 # Install Qemu
 apt-get install -y qemu-system-x86 cpulimit
@@ -162,7 +165,10 @@ chown root:root /etc/docker/daemon.json
 chmod 644 /etc/docker/daemon.json
 
 # Install VNC support for Docker
-apt-get install -y tigervnc-standalone-server
+apt-get install -y --allow-change-held-packages tigervnc-standalone-server
+
+# Prevent tigervnc to be uninstalled by cleaner.sh
+apt-mark hold tigervnc-standalone-server
 
 # Install net-tools for ifconfig etc.
 apt-get install -y net-tools

scripts/cleaner.sh

@@ -1,11 +1,5 @@
 #!/bin/bash
 
-set +e
-
-# Prevent these packages to be uninstalled by cleaner.sh
-apt-mark hold libvirt-daemon-system
-apt-mark hold tigervnc-standalone-server
-
 sudo apt-get purge -y --yes vim-common
 sudo apt-get purge -y --yes usbutils
 sudo apt-get purge -y --yes man-db
@@ -35,6 +29,7 @@ sudo apt-get purge -y --yes pppoeconf
 sudo apt-get purge -y --yes popularity-contest
 sudo apt-get purge -y --yes installation-report
 sudo apt-get purge -y --yes command-not-found
+sudo apt-get purge -y --yes command-not-found-data
 sudo apt-get purge -y --yes friendly-recovery
 sudo apt-get purge -y --yes fonts-ubuntu-font-family-console
 sudo apt-get purge -y --yes laptop-detect
@@ -95,7 +90,3 @@ sudo e4defrag / &>/dev/null
 
 # Setup zerofree for disk compaction
 sudo bash /usr/local/bin/zerofree
-
-# Unhold previously held packages
-sudo apt-mark unhold libvirt-daemon-system
-sudo apt-mark unhold tigervnc-standalone-server

scripts/qemu.sh

@@ -42,6 +42,7 @@ else
   sudo add-apt-repository -y --remove ppa:canonical-server/server-backports
 fi
 
+sudo apt-mark unhold libvirt-daemon-system
 sudo apt-get purge -y "qemu*"
 sudo apt-get update
 sudo apt-get install -y qemu-system-x86