conforming to mininet style
This commit is contained in:
+7
-6
@@ -745,15 +745,16 @@ class HostWithPrivateDirs( Host ):
|
|||||||
for directory in self.privateDirs:
|
for directory in self.privateDirs:
|
||||||
if isinstance( directory, tuple ):
|
if isinstance( directory, tuple ):
|
||||||
# mount given private directory
|
# mount given private directory
|
||||||
privateDir = directory[ 1 ] %self.__dict__
|
privateDir = directory[ 1 ] % self.__dict__
|
||||||
mountPoint = directory[ 0 ]
|
mountPoint = directory[ 0 ]
|
||||||
self.cmd( 'mkdir -p %s' %privateDir )
|
self.cmd( 'mkdir -p %s' % privateDir )
|
||||||
self.cmd( 'mkdir -p %s' %mountPoint )
|
self.cmd( 'mkdir -p %s' % mountPoint )
|
||||||
self.cmd( 'mount --bind %s %s' %( privateDir, mountPoint ) )
|
self.cmd( 'mount --bind %s %s' %
|
||||||
|
( privateDir, mountPoint ) )
|
||||||
else:
|
else:
|
||||||
# mount temporary filesystem on directory
|
# mount temporary filesystem on directory
|
||||||
self.cmd( 'mkdir -p %s' %directory )
|
self.cmd( 'mkdir -p %s' % directory )
|
||||||
self.cmd( 'mount -n -t tmpfs tmpfs %s' %directory )
|
self.cmd( 'mount -n -t tmpfs tmpfs %s' % directory )
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -133,7 +133,6 @@ int main(int argc, char *argv[])
|
|||||||
perror("mount");
|
perror("mount");
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
break;
|
break;
|
||||||
case 'p':
|
case 'p':
|
||||||
/* print pid */
|
/* print pid */
|
||||||
@@ -163,8 +162,6 @@ int main(int argc, char *argv[])
|
|||||||
perror("setns");
|
perror("setns");
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
break;
|
break;
|
||||||
case 'g':
|
case 'g':
|
||||||
/* Attach to cgroup */
|
/* Attach to cgroup */
|
||||||
|
|||||||
Reference in New Issue
Block a user