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

Pass code check (except bogus Popen error)

Browse Source
This commit is contained in:
Bob Lantz
2013-09-11 12:00:15 -07:00
committed by Brian O'Connor
parent 0c5aae157a
commit 445c0959b5
1 changed files with 17 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
examples/bind.py
+17 -14
View File
@@ -34,20 +34,20 @@ def mountPoints():
mounts.append( mount ) mounts.append( mount )
return mounts return mounts
def unmountAll( dir=MNRUNDIR ): def unmountAll( rootdir=MNRUNDIR ):
"Unmount all mounts under a directory tree" "Unmount all mounts under a directory tree"
dir = realpath( dir ) rootdir = realpath( rootdir )
# Find all mounts below dir # Find all mounts below rootdir
# This is subtle because /foo is not # This is subtle because /foo is not
# a parent of /foot # a parent of /foot
dirslash = dir + '/' dirslash = rootdir + '/'
mounts = [ m for m in mountPoints() mounts = [ m for m in mountPoints()
if m == dir or m.find( dirslash ) == 0 ] if m == dir or m.find( dirslash ) == 0 ]
# Unmount them from bottom to top # Unmount them from bottom to top
mounts.sort( reverse=True ) mounts.sort( reverse=True )
for mount in mounts: for mount in mounts:
debug( 'Unmounting', mount, '\n' ) debug( 'Unmounting', mount, '\n' )
out, err, code = errRun( 'umount', mount ) _out, err, code = errRun( 'umount', mount )
if code != 0: if code != 0:
info( '*** Warning: failed to umount', mount, '\n' ) info( '*** Warning: failed to umount', mount, '\n' )
info( err ) info( err )
@@ -69,6 +69,7 @@ class HostWithPrivateDirs( Host ):
self.unmount = kwargs.pop( 'unmount', True ) self.unmount = kwargs.pop( 'unmount', True )
Host.__init__( self, name, *args, **kwargs ) Host.__init__( self, name, *args, **kwargs )
self.rundir = '%s/%s' % ( self.mnRunDir, name ) self.rundir = '%s/%s' % ( self.mnRunDir, name )
self.root, self.private = None, None # set in createBindMounts
if self.privateDirs: if self.privateDirs:
self.privateDirs = [ realpath( d ) for d in self.privateDirs ] self.privateDirs = [ realpath( d ) for d in self.privateDirs ]
self.createBindMounts() self.createBindMounts()
@@ -88,28 +89,30 @@ class HostWithPrivateDirs( Host ):
def mountPrivateDirs( self ): def mountPrivateDirs( self ):
"Create and bind mount private dirs" "Create and bind mount private dirs"
for dir in self.privateDirs: for dir_ in self.privateDirs:
privateDir = self.private + dir privateDir = self.private + dir_
errFail( 'mkdir -p ' + privateDir ) errFail( 'mkdir -p ' + privateDir )
mountPoint = self.root + dir mountPoint = self.root + dir_
errFail( 'mount -B %s %s' % errFail( 'mount -B %s %s' %
( privateDir, mountPoint) ) ( privateDir, mountPoint) )
def mountDirs( self, dirs ): def mountDirs( self, dirs ):
"Mount a list of directories" "Mount a list of directories"
for dir in dirs: for dir_ in dirs:
mountpoint = self.root + dir mountpoint = self.root + dir_
errFail( 'mount -B %s %s' % errFail( 'mount -B %s %s' %
( dir, mountpoint ) ) ( dir_, mountpoint ) )
@classmethod @classmethod
def findRemounts( cls, fstypes=[ 'nfs' ] ): def findRemounts( cls, fstypes=None ):
"""Identify mount points in /proc/mounts to remount """Identify mount points in /proc/mounts to remount
fstypes: file system types to match""" fstypes: file system types to match"""
if fstypes is None:
fstypes = [ 'nfs' ]
dirs = quietRun( 'cat /proc/mounts' ).strip().split( '\n' ) dirs = quietRun( 'cat /proc/mounts' ).strip().split( '\n' )
remounts = [] remounts = []
for dir in dirs: for dir_ in dirs:
line = dir.split() line = dir_.split()
mountpoint, fstype = line[ 1 ], line[ 2 ] mountpoint, fstype = line[ 1 ], line[ 2 ]
# Don't re-remount directories!!! # Don't re-remount directories!!!
if mountpoint.find( cls.mnRunDir ) == 0: if mountpoint.find( cls.mnRunDir ) == 0: