afonso/core-extra
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

daemon: Improve handling node-specific directory names.

Browse source
This commit is contained in:
Tom Goff 2015-11-23 09:44:34 -05:00
parent a83cf2fcb4
commit ce0bfc88eb
3 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
daemon/core/bsd/vnode.py
View file

@ -361,7 +361,8 @@ class JailNode(SimpleJailNode):
def privatedir(self, path): def privatedir(self, path):
if path[0] != "/": if path[0] != "/":
raise ValueError, "path not fully qualified: " + path raise ValueError, "path not fully qualified: " + path
hostpath = os.path.join(self.nodedir, path[1:].replace("/", ".")) hostpath = os.path.join(self.nodedir,
os.path.normpath(path).strip('/').replace('/', '.'))
try: try:
os.mkdir(hostpath) os.mkdir(hostpath)
except OSError: except OSError:

3
daemon/core/netns/vnode.py
View file

@ -366,7 +366,8 @@ class LxcNode(SimpleLxcNode):
def privatedir(self, path): def privatedir(self, path):
if path[0] != "/": if path[0] != "/":
raise ValueError, "path not fully qualified: " + path raise ValueError, "path not fully qualified: " + path
hostpath = os.path.join(self.nodedir, path[1:].replace("/", ".")) hostpath = os.path.join(self.nodedir,
os.path.normpath(path).strip('/').replace('/', '.'))
try: try:
os.mkdir(hostpath) os.mkdir(hostpath)
except OSError: except OSError:

3
daemon/core/phys/pnodes.py
View file

@ -216,7 +216,8 @@ class PhysicalNode(PyCoreNode):
def privatedir(self, path): def privatedir(self, path):
if path[0] != "/": if path[0] != "/":
raise ValueError, "path not fully qualified: " + path raise ValueError, "path not fully qualified: " + path
hostpath = os.path.join(self.nodedir, path[1:].replace("/", ".")) hostpath = os.path.join(self.nodedir,
os.path.normpath(path).strip('/').replace('/', '.'))
try: try:
os.mkdir(hostpath) os.mkdir(hostpath)
except OSError: except OSError: