From abcdf185476df3d7946ea4a1f0c9e1bdeb547acb Mon Sep 17 00:00:00 2001
From: Bob Lantz <rlantz@cs.stanford.edu>
Date: Mon, 10 Nov 2014 14:04:00 -0800
Subject: [PATCH] Uninstall ntpd to disable it more reliably
---
util/vm/build.py | 13 ++++++++-----
1 file changed, 8 insertions(+), 5 deletions(-)
diff --git a/util/vm/build.py b/util/vm/build.py
index 5d5edf57..570afcfc 100755
--- a/util/vm/build.py
+++ b/util/vm/build.py
@@ -487,10 +487,13 @@ def login( vm, user='mininet', password='mininet' ):
log( '* Waiting for login...' )
-def setClock( vm, prompt=Prompt ):
- "Turn off ntpd and set clock immediately"
- log( '* Attempting to shut down ntpd' )
- vm.sendline( 'sudo -n service ntp stop' )
+def removeNtpd( vm, prompt=Prompt, ntpPackage='ntp' ):
+ "Remove ntpd and set clock immediately"
+ log( '* Removing ntpd' )
+ vm.sendline( 'sudo apt-get -y remove ' + ntpPackage )
+ vm.expect( prompt )
+ # Try to make sure that it isn't still running
+ vm.sendline( 'sudo pkill ntpd' )
vm.expect( prompt )
log( '* Getting seconds since epoch from this server' )
# Note r'date +%s' specifies a format for 'date', not python!
@@ -833,7 +836,7 @@ def runTests( vm, tests=None, pre='', post='', prompt=Prompt ):
"Run tests (list) in vm (pexpect object)"
# We disable ntpd and set the time so that ntpd won't be
# messing with the time during tests
- setClock( vm )
+ removeNtpd( vm )
vm.expect( prompt )
if Branch:
checkOutBranch( vm, branch=Branch )
--
GitLab