From 9c3ecfe338e361cbeaec18689c5632c372873794 Mon Sep 17 00:00:00 2001 From: Cody Burkard Date: Wed, 2 Jul 2014 10:53:41 -0700 Subject: [PATCH] conforming to mininet style --- mininet/node.py | 13 +++++++------ mnexec.c | 3 --- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/mininet/node.py b/mininet/node.py index bdf7642..72c782a 100644 --- a/mininet/node.py +++ b/mininet/node.py @@ -745,15 +745,16 @@ class HostWithPrivateDirs( Host ): for directory in self.privateDirs: if isinstance( directory, tuple ): # mount given private directory - privateDir = directory[ 1 ] %self.__dict__ + privateDir = directory[ 1 ] % self.__dict__ mountPoint = directory[ 0 ] - self.cmd( 'mkdir -p %s' %privateDir ) - self.cmd( 'mkdir -p %s' %mountPoint ) - self.cmd( 'mount --bind %s %s' %( privateDir, mountPoint ) ) + self.cmd( 'mkdir -p %s' % privateDir ) + self.cmd( 'mkdir -p %s' % mountPoint ) + self.cmd( 'mount --bind %s %s' % + ( privateDir, mountPoint ) ) else: # mount temporary filesystem on directory - self.cmd( 'mkdir -p %s' %directory ) - self.cmd( 'mount -n -t tmpfs tmpfs %s' %directory ) + self.cmd( 'mkdir -p %s' % directory ) + self.cmd( 'mount -n -t tmpfs tmpfs %s' % directory ) diff --git a/mnexec.c b/mnexec.c index 8f6830e..c7103d4 100644 --- a/mnexec.c +++ b/mnexec.c @@ -133,7 +133,6 @@ int main(int argc, char *argv[]) perror("mount"); return 1; } - break; case 'p': /* print pid */ @@ -163,8 +162,6 @@ int main(int argc, char *argv[]) perror("setns"); return 1; } - - break; case 'g': /* Attach to cgroup */