lab/mininet
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Uninstall ntpd to disable it more reliably

Browse Source
This commit is contained in:
Bob Lantz
2014-11-10 14:09:35 -08:00
parent 4a304688f4
commit abcdf18547
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
util/vm/build.py
+8 -5
View File
@@ -487,10 +487,13 @@ def login( vm, user='mininet', password='mininet' ):
log( '* Waiting for login...' ) log( '* Waiting for login...' )
def setClock( vm, prompt=Prompt ): def removeNtpd( vm, prompt=Prompt, ntpPackage='ntp' ):
"Turn off ntpd and set clock immediately" "Remove ntpd and set clock immediately"
log( '* Attempting to shut down ntpd' ) log( '* Removing ntpd' )
vm.sendline( 'sudo -n service ntp stop' ) 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 ) vm.expect( prompt )
log( '* Getting seconds since epoch from this server' ) log( '* Getting seconds since epoch from this server' )
# Note r'date +%s' specifies a format for 'date', not python! # 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)" "Run tests (list) in vm (pexpect object)"
# We disable ntpd and set the time so that ntpd won't be # We disable ntpd and set the time so that ntpd won't be
# messing with the time during tests # messing with the time during tests
setClock( vm ) removeNtpd( vm )
vm.expect( prompt ) vm.expect( prompt )
if Branch: if Branch:
checkOutBranch( vm, branch=Branch ) checkOutBranch( vm, branch=Branch )