From 92a4f2ddbf32537a4da1945b047939b41f7ce812 Mon Sep 17 00:00:00 2001
From: Bob Lantz <rlantz@cs.stanford.edu>
Date: Wed, 1 Oct 2014 17:29:04 -0700
Subject: [PATCH] Try using ntpd since ntpdate doesn't always work

---
 util/vm/build.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/util/vm/build.py b/util/vm/build.py
index 670fa1dc..48059dd3 100755
--- a/util/vm/build.py
+++ b/util/vm/build.py
@@ -490,7 +490,8 @@ def disableNtpd( vm, prompt=Prompt, ntpserver='pool.ntp.org' ):
     vm.sendline( 'sudo -n service ntp stop' )
     vm.expect( prompt )
     log( '* Setting clock from', ntpserver  )
-    vm.sendline( 'sudo -n ntpdate ' + ntpserver )
+    # -gq: set and quit immediately
+    vm.sendline( 'sudo -n ntpd -gq ' + ntpserver )
     vm.expect( prompt )
     log( '* Waiting one second and running date command' )
     vm.sendline( 'sleep 1 && date ' )
-- 
GitLab