handle ubuntu noble better

Signed-off-by: Thomas Sjögren <[email protected]>

runTests.sh

@@ -34,22 +34,20 @@ done
 
 wait
 
-grep config.vm.define Vagrantfile | grep -v '^#' | grep -o '".*"' | tr -d '"' |\
-  while read -r v; do
-    vagrant reload "${v}"
-done
-
-wait
-
 for VM in $(vagrant status | grep -iE 'running.*virtualbox' | awk '{print $1}'); do
   vagrant ssh "${VM}" -c 'cp /vagrant/checkScore.sh ~/'
   vagrant ssh "${VM}" -c 'cp /vagrant/misc/genOSCAPreport.sh ~/'
   vagrant ssh "${VM}" -c 'sudo apt-get -y update && sudo apt-get -y install bats net-tools shellcheck --no-install-recommends'
-  vagrant ssh "${VM}" -c 'cp -R /vagrant ~/hardening && sed -i.bak -e "s/^AUTOFILL=.*/AUTOFILL='\''Y'\''/" -e "s/^CHANGEME=.*/CHANGEME='\''changed'\''/" ~/hardening/ubuntu.cfg && cd ~/hardening && sudo bash ubuntu.sh && sudo reboot'
+  vagrant ssh "${VM}" -c 'cp -R /vagrant ~/hardening && sed -i.bak -e "s/^AUTOFILL=.*/AUTOFILL='\''Y'\''/" -e "s/^CHANGEME=.*/CHANGEME='\''changed'\''/" ~/hardening/ubuntu.cfg && cd ~/hardening && sudo bash ubuntu.sh && sudo shutdown -h now'
 done
 
 wait
 
+grep config.vm.define Vagrantfile | grep -v '^#' | grep -o '".*"' | tr -d '"' |\
+  while read -r v; do
+    vagrant up --provision "${v}"
+done
+
 for VM in $(vagrant status | grep -iE 'running.*virtualbox' | awk '{print $1}'); do
   while ! vagrant ssh "$VM" -c 'id'; do
     echo "Waiting for $VM."