Merge pull request #2485 from Varying-Vagrant-Vagrants/fix/earlier-ntpupdate

Run ntpupdate if it's available, and at a much earlier stage

Author: tomjn

CHANGELOG.md

@@ -44,6 +44,7 @@ permalink: /docs/en-US/changelog/
 * Warnings that you're missing vagrant plugins no longer show when running vagrant plugin commands
 * Force the Virtual Machine to 64bit on VirtualBox to avoid infinite loops on 32bit architectures
 * Force the installation and update of grunt and grunt-cli so that old grunt is always overwritten when updated
+* Sync clocks before provisioning if ntpdate is available to avoid Apt mirror time issues
 * Fixed cloning the dashboard git repository with unknown remote branches
 
 ## 3.6.2 ( 2021 March 17th )

config/homebin/vagrant_up

@@ -29,10 +29,16 @@ fi
 
 vvv_info " * Restarting Nginx"
 sudo service nginx restart
+
 vvv_info " * Restarting MariaDB"
 sudo service mysql restart
-vvv_info " * Syncing clocks"
-sudo ntpdate -u ntp.ubuntu.com
+
+if [ -x "$(command -v ntpdate)" ]; then
+	vvv_info " * Syncing clocks"
+	sudo ntpdate -u ntp.ubuntu.com
+else
+	vvv_info " - skipping ntpdate clock sync, not installed yet"
+fi
 
 mkdir -p /vagrant/failed_provisioners
 if [ -z "$(ls -A /vagrant/failed_provisioners/)" ]; then

provision/provision.sh

@@ -18,6 +18,13 @@ rm -f /vagrant/version
 rm -f /vagrant/vvv-custom.yml
 rm -f /vagrant/config.yml
 
+if [ -x "$(command -v ntpdate)" ]; then
+	echo " * Syncing clocks"
+	sudo ntpdate -u ntp.ubuntu.com
+else
+	echo " - skipping ntpdate clock sync, not installed yet"
+fi
+
 touch /vagrant/provisioned_at
 echo $(date "+%Y.%m.%d_%H-%M-%S") > /vagrant/provisioned_at